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 2421674eef..c429ff4a29 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`). 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).
 
-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..fc026dfa32
--- /dev/null
+++ b/.github/instructions/sqlclient-package-versions.instructions.md
@@ -0,0 +1,154 @@
+---
+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`.
+
+## Scenarios
+
+### 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 receives an explicit family `-p:SqlClientPackageVersion=<value>` (and `-p:SqlServerPackageVersion=` where needed), 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
+  `releaseSqlServer` boolean:
+
+| `releaseSqlServer` | 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 |
+
+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.
+
+#### 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 073f6afc68..467efdae69 100644
--- a/BUILDGUIDE.md
+++ b/BUILDGUIDE.md
@@ -93,7 +93,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 -->
 
@@ -119,10 +120,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
@@ -227,16 +229,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
 
@@ -252,10 +252,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:
@@ -267,17 +268,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                                                   |
 |------------------|---------------|---------------|------------------|------------------|---------------|------------------------------------------------------------|
@@ -297,18 +300,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.
 
@@ -318,23 +318,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/
 ```
 
@@ -343,9 +343,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/
 ```
 
@@ -354,9 +352,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 59839f2351..245c716d33 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -4,28 +4,27 @@
   <!--
     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:
+    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.
 
-      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.
+    Microsoft.SqlServer.Server is versioned separately in its own Versions.props.  In Package mode
+    we import both canonical files here so that centrally-managed PackageVersion items below 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.
+    Each Versions.props sets an import-guard property (SqlClientVersionsImported /
+    SqlServerVersionsImported) on first load so that re-imports become no-ops.
+  -->
+  <!--
+    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 +57,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 4ff29a08df..b36ef3deab 100644
--- a/build.proj
+++ b/build.proj
@@ -89,99 +89,31 @@
     </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
-    -->
-    <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
+      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.
+
+      For backwards compatibility with existing target call sites, the historical per-package
+      version *arguments* are retained as aliases of PackageVersionSqlClientArgument.  They are
+      defined immediately after PackageVersionSqlClient so that the alias picks up its value.
     -->
-    <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
+      Applies to:     BuildSqlClient*, PackSqlClient, BuildLogging, PackLogging, BuildAbstractions,
+                      PackAbstractions, BuildAzure, PackAzure, BuildAkvProvider, PackAkvProvider,
+                      TestSqlClient, TestSqlClientFunctional, TestSqlClientManual, 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.
+      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.  If omitted, the version defaults to the
+                      value calculated by Versions.props.
 
       Default value:  [blank]
       Example:        7.0.0-preview4
@@ -191,6 +123,16 @@
       -p:SqlClientPackageVersion=$(PackageVersionSqlClient)
     </PackageVersionSqlClientArgument>
 
+    <!--
+      Backwards-compatible aliases for the SqlClient family packages.  These all resolve to the
+      single PackageVersionSqlClientArgument so that existing target call sites continue to pass the
+      correct (shared) family version.  They must be defined after PackageVersionSqlClientArgument.
+    -->
+    <PackageVersionAbstractionsArgument>$(PackageVersionSqlClientArgument)</PackageVersionAbstractionsArgument>
+    <PackageVersionAkvProviderArgument>$(PackageVersionSqlClientArgument)</PackageVersionAkvProviderArgument>
+    <PackageVersionAzureArgument>$(PackageVersionSqlClientArgument)</PackageVersionAzureArgument>
+    <PackageVersionLoggingArgument>$(PackageVersionSqlClientArgument)</PackageVersionLoggingArgument>
+
     <!--
       PackageVersionSqlServer
       Applies to:     BuildSqlServer
@@ -388,6 +330,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 packages.
     Note: This will run for a *very* long time and it is not recommended, even in automated test
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 1b1ea7a2e7..6c16c15d18 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'.
@@ -374,9 +367,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')) }}:
@@ -390,9 +381,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 86ddc0ca45..60dc4b8a4b 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 }}
@@ -157,13 +147,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 9ee7c7132d..1a341a7548 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 98cac1bcdd..ceeca91dde 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 7068c9693c..fcdec8ad2e 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..799d67d012 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,7 @@ jobs:
             configurationToPack: ${{ parameters.buildConfiguration }}
             packDirectory: $(dotnetPackagesDir)
             verbosityToPack: ${{ parameters.dotnetVerbosity }}
-            buildProperties: AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }};AbstractionsAssemblyFileVersion=${{ parameters.abstractionsAssemblyFileVersion }};ReferenceType=Package;LoggingPackageVersion=${{ parameters.loggingPackageVersion }}
+            buildProperties: SqlClientPackageVersion=${{ parameters.packageVersion }};ReferenceType=Package
 
       - ${{ else }}:
         - task: DotNetCoreCLI@2
@@ -165,7 +155,7 @@ jobs:
             configurationToPack: ${{ parameters.buildConfiguration }}
             packDirectory: $(dotnetPackagesDir)
             verbosityToPack: ${{ parameters.dotnetVerbosity }}
-            buildProperties: AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }};AbstractionsAssemblyFileVersion=${{ parameters.abstractionsAssemblyFileVersion }}
+            buildProperties: SqlClientPackageVersion=${{ parameters.packageVersion }}
 
       # 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..8e71957792 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,7 @@ jobs:
             configurationToPack: ${{ parameters.buildConfiguration }}
             packDirectory: $(dotnetPackagesDir)
             verbosityToPack: ${{ parameters.dotnetVerbosity }}
-            buildProperties: AzurePackageVersion=${{ parameters.azurePackageVersion }};AzureAssemblyFileVersion=${{ parameters.azureAssemblyFileVersion }};ReferenceType=Package;LoggingPackageVersion=${{ parameters.loggingPackageVersion }};AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
+            buildProperties: SqlClientPackageVersion=${{ parameters.packageVersion }};ReferenceType=Package
 
       - ${{ else }}:
         - task: DotNetCoreCLI@2
@@ -182,7 +166,7 @@ jobs:
             configurationToPack: ${{ parameters.buildConfiguration }}
             packDirectory: $(dotnetPackagesDir)
             verbosityToPack: ${{ parameters.dotnetVerbosity }}
-            buildProperties: AzurePackageVersion=${{ parameters.azurePackageVersion }};AzureAssemblyFileVersion=${{ parameters.azureAssemblyFileVersion }}
+            buildProperties: SqlClientPackageVersion=${{ parameters.packageVersion }}
 
       # 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..10ee3e47da 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,7 @@ jobs:
           configurationToPack: ${{ parameters.buildConfiguration }}
           packDirectory: $(dotnetPackagesDir)
           verbosityToPack: ${{ parameters.dotnetVerbosity }}
-          buildProperties: LoggingPackageVersion=${{ parameters.loggingPackageVersion }};LoggingAssemblyFileVersion=${{ parameters.loggingAssemblyFileVersion }}
+          buildProperties: SqlClientPackageVersion=${{ parameters.packageVersion }}
 
       # Publish the NuGet packages as a named pipeline artifact.
       - task: PublishPipelineArtifact@1
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 438b011fab..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: 1.1.0.$(assemblyBuildNumber)
-
-  # Abstractions library NuGet package version
-  - name: abstractionsPackageVersion
-    value: 1.1.0-preview1ci$(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-preview1ci$(Build.BuildNumber)
-
-  # Azure library assembly file version
-  - name: azureAssemblyFileVersion
-    value: 1.1.0.$(assemblyBuildNumber)
-
-  # Azure library NuGet package version
-  - name: azurePackageVersion
-    value: 1.1.0-preview1ci$(Build.BuildNumber)
-
-  # Logging library assembly file version
-  - name: loggingAssemblyFileVersion
-    value: 1.1.0.$(assemblyBuildNumber)
-
-  # Logging library NuGet package version
-  - name: loggingPackageVersion
-    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
-  #    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)
-
-  # 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 51c70e8c64..e312a23e00 100644
--- a/eng/pipelines/onebranch/jobs/build-buildproj-job.yml
+++ b/eng/pipelines/onebranch/jobs/build-buildproj-job.yml
@@ -48,18 +48,21 @@ 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.
+  # * artifactName - (Optional) Name of the artifact published in a previous job that contains the
+  #   desired version of the dependency.  Omit 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).
+  # Assembly file version for APIScan (e.g. 1.0.0.12345). Pre-computed by compute-versions stage.
   - name: fileVersion
     type: string
+    default: ''
 
   # The full name of the package. This is used in the job name, and to form DLL and PDB filenames
   # for APIScan.
@@ -85,7 +88,7 @@ parameters:
       - 'SqlClient'
       - 'SqlServer'
 
-  # The version of the package.
+  # Package version (required). Pre-computed by compute-versions stage.
   - name: packageVersion
     type: string
 
@@ -107,25 +110,27 @@ jobs:
       ob_sdl_apiscan_softwareFolder: ${{ parameters.apiScanDllPath }}
       ob_sdl_apiscan_symbolsFolder: ${{ parameters.apiScanPdbPath }}
       ob_sdl_apiscan_softwarename: ${{ parameters.packageFullName }}
-      ob_sdl_apiscan_versionNumber: ${{ parameters.fileVersion }}
+      ob_sdl_apiscan_versionNumber: ${{ coalesce(parameters.fileVersion, '0.0.0.0') }}
 
     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"
+      # Constructs the dependency package version parameters to pass to the build steps.
+      # Each dependency has a pre-computed version from the compute-versions stage.
+      # 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 }}
+          - 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
+          # Download the pipeline artifact for this dependency package, when it was built in this
+          # run.  Dependencies without an artifactName are restored from NuGet instead (e.g. a
+          # previously published SqlServer package), so no download is needed.
+          - ${{ if 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,12 +139,20 @@ jobs:
       # such as _CheckPwshToolRestored that run during RoslynAnalyzers and Build.
       - template: /eng/pipelines/common/steps/restore-dotnet-tools.yml@self
 
+      # Set the package version for downstream steps.
+      - script: |
+          echo "Using packageVersion: ${{ parameters.packageVersion }}"
+          echo "##vso[task.setvariable variable=packageVersion]${{ parameters.packageVersion }}"
+          echo "##vso[task.setvariable variable=packageVersion;isOutput=true]${{ parameters.packageVersion }}"
+        displayName: "Set Package Version - ${{ parameters.packageShortName }}"
+        name: "extractVersion"
+
       # 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 }}
+          packageVersion: $(packageVersion)
 
       # Build the package, producing DLLs only (no NuGet package yet).
       - template: /eng/pipelines/onebranch/steps/build-buildproj-step.yml@self
@@ -147,7 +160,7 @@ jobs:
           buildConfiguration: Release
           dependencyArguments: $(dependencyPackageArguments)
           packageShortName: ${{ parameters.packageShortName }}
-          packageVersion: ${{ parameters.packageVersion }}
+          packageVersion: $(packageVersion)
 
       - ${{ if eq(parameters.shouldSignPackage, true) }}:
           # ESRP sign the DLLs.
@@ -193,7 +206,7 @@ jobs:
           dependencyArguments: $(dependencyPackageArguments)
           packageFullName: ${{ parameters.packageFullName }}
           packageShortName: ${{ parameters.packageShortName }}
-          packageVersion: ${{ parameters.packageVersion }}
+          packageVersion: $(packageVersion)
 
       - ${{ if eq(parameters.shouldSignPackage, true) }}:
           # ESRP sign the NuGet package.
diff --git a/eng/pipelines/onebranch/jobs/publish-symbols-job.yml b/eng/pipelines/onebranch/jobs/publish-symbols-job.yml
index 8ee37ad7d7..ee36e57a82 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
 
@@ -53,29 +53,18 @@ jobs:
       type: linux
 
     variables:
-      # 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.
-      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.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
-      # 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 }}
+      - name: ob_outputDirectory
+        value: $(Build.SourcesDirectory)/no_publish
+      - name: ob_sdl_apiscan_enabled
+        value: false
+      - name: ob_sdl_binskim_break
+        value: false
+      - name: ob_sdl_binskim_enabled
+        value: false
+      - name: artifactPath
+        value: '$(Pipeline.Workspace)/${{ parameters.packageFullName }}'
+      - name: ArtifactServices.Symbol.AccountName
+        value: ${{ parameters.symbolsUploadAccount }}
 
     steps:
       # Create ob_outputDirectory with a .artifactignore that excludes everything,
diff --git a/eng/pipelines/onebranch/sqlclient-non-official.yml b/eng/pipelines/onebranch/sqlclient-non-official.yml
index abf9b6dcbe..168b43453d 100644
--- a/eng/pipelines/onebranch/sqlclient-non-official.yml
+++ b/eng/pipelines/onebranch/sqlclient-non-official.yml
@@ -32,60 +32,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
 
@@ -179,31 +147,21 @@ extends:
         configFile: '$(REPO_ROOT)/.config/tsaoptions.json'
 
     stages:
+      - template: /eng/pipelines/onebranch/stages/compute-versions-stage.yml@self
+        parameters:
+          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)'
@@ -215,22 +173,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)'
@@ -251,21 +201,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 8ea429bb00..1a28c530fc 100644
--- a/eng/pipelines/onebranch/sqlclient-official.yml
+++ b/eng/pipelines/onebranch/sqlclient-official.yml
@@ -54,60 +54,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
 
@@ -207,31 +175,21 @@ extends:
         configFile: '$(REPO_ROOT)/.config/tsaoptions.json'
 
     stages:
+      - template: /eng/pipelines/onebranch/stages/compute-versions-stage.yml@self
+        parameters:
+          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)'
@@ -243,22 +201,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)'
@@ -283,21 +233,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..aeccf6d7cb 100644
--- a/eng/pipelines/onebranch/stages/build-stages.yml
+++ b/eng/pipelines/onebranch/stages/build-stages.yml
@@ -24,71 +24,57 @@ parameters:
 
   # ── Build parameters ───────────────────────────────────────────────────
 
-  - name: buildSqlServerServer
+  # 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
 
-  - name: buildSqlClient
-    type: boolean
-
-  - name: buildAkvProvider
-    type: boolean
-
-  # Package Parameters -----------------------------------------------------
-
-  - name: abstractionsArtifactsName
-    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.
+  # Callers may override with explicit values if needed.
+  #
+  # The SqlClient family (Logging, Abstractions, SqlClient, Azure, AKV Provider) shares the
+  # SqlClient version, so a single sqlClient{Package,File}Version covers them all.
+  # Microsoft.SqlServer.Server is versioned separately.
 
-  - name: abstractionsFileVersion
+  - name: sqlClientPackageVersion
     type: string
+    default: $(sqlClientPackageVersion)
 
-  - name: abstractionsPackageVersion
+  - name: sqlServerPackageVersion
     type: string
+    default: $(sqlServerPackageVersion)
 
-  - name: akvProviderArtifactsName
+  - name: sqlClientFileVersion
     type: string
+    default: $(sqlClientFileVersion)
 
-  - name: akvProviderFileVersion
+  - name: sqlServerFileVersion
     type: string
+    default: $(sqlServerFileVersion)
 
-  - name: akvProviderPackageVersion
-    type: string
+  # Package Parameters -----------------------------------------------------
 
-  - name: azureArtifactsName
+  - name: abstractionsArtifactsName
     type: string
 
-  - name: azureFileVersion
+  - name: akvProviderArtifactsName
     type: string
 
-  - name: azurePackageVersion
+  - name: azureArtifactsName
     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 +102,40 @@ stages:
   # ====================================================================
   - stage: build_independent
     displayName: "Build Independent Packages"
+    dependsOn: compute_versions
+
+    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:
-      - ${{ 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 }}'
-
-
-      - ${{ if eq(parameters.buildSqlServerServer, 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.sqlClientFileVersion }}'
+          packageFullName: 'Microsoft.Data.SqlClient.Internal.Logging'
+          packageShortName: 'Logging'
+          packageVersion: '${{ parameters.sqlClientPackageVersion }}'
+
+
+      - ${{ if eq(parameters.buildSqlServer, true) }}:
         # Build Microsoft.SqlServer.Server
         - template: /eng/pipelines/onebranch/jobs/build-buildproj-job.yml@self
           parameters:
@@ -164,148 +160,188 @@ stages:
   # 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: sqlClientPackageVersion
+        value: $[ stageDependencies.compute_versions.compute_versions_job.outputs['versions.SqlClientPackageVersion'] ]
+      - name: sqlClientFileVersion
+        value: $[ stageDependencies.compute_versions.compute_versions_job.outputs['versions.SqlClientFileVersion'] ]
+
+    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.sqlClientPackageVersion }}'
+          fileVersion: '${{ parameters.sqlClientFileVersion }}'
+          packageFullName: 'Microsoft.Data.SqlClient.Extensions.Abstractions'
+          packageShortName: 'Abstractions'
+          packageVersion: '${{ parameters.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: 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'] ]
+
+    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.sqlClientPackageVersion }}'
+            - artifactName: '${{ parameters.loggingArtifactsName }}'
+              shortName: 'Logging'
+              version: '${{ parameters.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: '${{ parameters.sqlServerPackageVersion }}'
+            - ${{ else }}:
+              - 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.sqlClientPackageVersion }}'
+            - artifactName: '${{ parameters.loggingArtifactsName }}'
+              shortName: 'Logging'
+              version: '${{ parameters.sqlClientPackageVersion }}'
+          fileVersion: '${{ parameters.sqlClientFileVersion }}'
+          packageFullName: 'Microsoft.Data.SqlClient.Extensions.Azure'
+          packageShortName: 'Azure'
+          packageVersion: '${{ parameters.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: 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'] ]
+
+    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.sqlClientPackageVersion }}'
+            - artifactName: '${{ parameters.loggingArtifactsName }}'
+              shortName: 'Logging'
+              version: '${{ parameters.sqlClientPackageVersion }}'
+            - artifactName: '${{ parameters.sqlClientArtifactsName }}'
+              shortName: 'SqlClient'
+              version: '${{ parameters.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: '${{ parameters.sqlServerPackageVersion }}'
+            - ${{ else }}:
+              - shortName: 'SqlServer'
+                version: '${{ parameters.sqlServerPackageVersion }}'
+          fileVersion: '${{ parameters.sqlClientFileVersion }}'
+          packageFullName: 'Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider'
+          packageShortName: 'AkvProvider'
+          packageVersion: '${{ parameters.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..148ea9115b
--- /dev/null
+++ b/eng/pipelines/onebranch/stages/compute-versions-stage.yml
@@ -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.                #
+#################################################################################
+
+# 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).
+#   - 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 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'
+
+          # Extract versions (package, published, file) for the SqlClient family
+          # (GetVersionsSqlClient) and Microsoft.SqlServer.Server (GetVersionsSqlServer).
+          # Each target emits labeled messages to stdout.
+          - script: |
+              set -euo pipefail
+              echo "Extracting versions with BuildNumber=$(Build.BuildNumber)..."
+
+              extract() {
+                local label="$1"
+                local output
+                output=$(dotnet build "$(Build.SourcesDirectory)/build.proj" -t:"GetVersions${label}" -v:m -nologo -p:BuildNumber=$(Build.BuildNumber))
+                local pkg pub file
+                pkg=$(echo "$output" | sed -n 's/^ *PackageVersion: //p')
+                pub=$(echo "$output" | sed -n 's/^ *PublishedVersion: //p')
+                file=$(echo "$output" | sed -n 's/^ *FileVersion: //p')
+                echo "  ${label}: pkg=$pkg  pub=$pub  file=$file"
+                echo "##vso[task.setvariable variable=${label}NextVersion]$pkg"
+                echo "##vso[task.setvariable variable=${label}PublishedVersion]$pub"
+                echo "##vso[task.setvariable variable=${label}FileVersion]$file"
+              }
+
+              # The SqlClient family shares one version; SqlServer is separate.
+              extract SqlClient
+              extract SqlServer
+            displayName: "Extract All Versions"
+
+          # Resolve effective versions and publish them as job output variables
+          # for consumption by downstream stages.
+          - script: |
+              echo "Resolving effective versions..."
+
+              # The SqlClient family always uses its "next" version.
+              SQLCLIENT_VERSION="$(SqlClientNextVersion)"
+
+              # Microsoft.SqlServer.Server uses its "next" version when it is built this run, or its
+              # "published" (last-shipped) version when it is not built — in which case the SqlClient
+              # family depends on the published SqlServer package restored from NuGet.
+              if [ "${{ parameters.buildSqlServer }}" = "True" ]; then
+                SQLSERVER_VERSION="$(SqlServerNextVersion)"
+              else
+                SQLSERVER_VERSION="$(SqlServerPublishedVersion)"
+              fi
+
+              echo "Effective versions:"
+              echo "  SqlClient (family): $SQLCLIENT_VERSION"
+              echo "  SqlServer:          $SQLSERVER_VERSION"
+
+              # Set as output variables (isOutput=true makes them visible to downstream stages).
+              echo "##vso[task.setvariable variable=SqlClientPackageVersion;isOutput=true]$SQLCLIENT_VERSION"
+              echo "##vso[task.setvariable variable=SqlServerPackageVersion;isOutput=true]$SQLSERVER_VERSION"
+              echo "##vso[task.setvariable variable=SqlClientFileVersion;isOutput=true]$(SqlClientFileVersion)"
+              echo "##vso[task.setvariable variable=SqlServerFileVersion;isOutput=true]$(SqlServerFileVersion)"
+            displayName: "Resolve Effective Versions"
+            name: "versions"
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 45309a77c6..b5dab3ebe1 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,32 +159,29 @@ 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: 'Package-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: 'Package-Release/Microsoft.Data.SqlClient.Internal.Logging.${{ parameters.loggingPackageVersion }}.nupkg'
               nugetServiceConnection: ${{ variables.nugetServiceConnection }}
               isProduction: ${{ parameters.isOfficial }}
               displaySuffix: ${{ variables.nugetTargetSuffix }}
 
-        - ${{ if eq(parameters.releaseAbstractions, true) }}:
+        - ${{ if eq(parameters.releaseSqlClient, true) }}:
           - template: /eng/pipelines/onebranch/jobs/publish-nuget-package-job.yml@self
             parameters:
               packageName: Microsoft.Data.SqlClient.Extensions.Abstractions
               artifactName: '${{ parameters.abstractionsArtifactsName }}'
-              packagePath: 'Package-Release/Microsoft.Data.SqlClient.Extensions.Abstractions.${{ parameters.abstractionsPackageVersion }}.nupkg'
               nugetServiceConnection: ${{ variables.nugetServiceConnection }}
               isProduction: ${{ parameters.isOfficial }}
               displaySuffix: ${{ variables.nugetTargetSuffix }}
@@ -223,27 +191,24 @@ stages:
             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) }}:
+        - ${{ if eq(parameters.releaseSqlClient, true) }}:
           - template: /eng/pipelines/onebranch/jobs/publish-nuget-package-job.yml@self
             parameters:
               packageName: Microsoft.Data.SqlClient.Extensions.Azure
               artifactName: '${{ parameters.azureArtifactsName }}'
-              packagePath: 'Package-Release/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.releaseSqlClient, true) }}:
           - template: /eng/pipelines/onebranch/jobs/publish-nuget-package-job.yml@self
             parameters:
               packageName: Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider
               artifactName: '${{ parameters.akvProviderArtifactsName }}'
-              packagePath: 'Package-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..503b512f97 100644
--- a/eng/pipelines/onebranch/steps/build-buildproj-step.yml
+++ b/eng/pipelines/onebranch/steps/build-buildproj-step.yml
@@ -37,9 +37,9 @@ 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 to assign to the project. Passed to msbuild as
+  #  "-p:PackageVersion<packageShortName>=<packageVersion>".
+  #  Always required — compute up-front via the compute-versions stage.
   - name: packageVersion
     type: string
 
diff --git a/eng/pipelines/onebranch/steps/pack-buildproj-step.yml b/eng/pipelines/onebranch/steps/pack-buildproj-step.yml
index 7a97c260d1..e3f9fdb96f 100644
--- a/eng/pipelines/onebranch/steps/pack-buildproj-step.yml
+++ b/eng/pipelines/onebranch/steps/pack-buildproj-step.yml
@@ -49,9 +49,9 @@ 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 to assign to the project. Passed to msbuild as
+  #  "-p:PackageVersion<packageShortName>=<packageVersion>".
+  #  Always required — compute up-front via the compute-versions stage.
   - name: packageVersion
     type: string
 
diff --git a/eng/pipelines/onebranch/steps/roslyn-analyzers-buildproj-step.yml b/eng/pipelines/onebranch/steps/roslyn-analyzers-buildproj-step.yml
index 89177f1d88..8579215f1f 100644
--- a/eng/pipelines/onebranch/steps/roslyn-analyzers-buildproj-step.yml
+++ b/eng/pipelines/onebranch/steps/roslyn-analyzers-buildproj-step.yml
@@ -33,7 +33,7 @@ parameters:
 
   #  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.
+  #  Always required — compute up-front via the compute-versions stage.
   - name: packageVersion
     type: string
 
diff --git a/eng/pipelines/onebranch/variables/package-variables.yml b/eng/pipelines/onebranch/variables/package-variables.yml
index 0a84bc3a70..0413749997 100644
--- a/eng/pipelines/onebranch/variables/package-variables.yml
+++ b/eng/pipelines/onebranch/variables/package-variables.yml
@@ -7,131 +7,54 @@
 # 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.
+#   drop_<stageName>_<jobName>
+#
+# Downstream stages download these via DownloadPipelineArtifact and must know the name.
 
 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 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: '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.1.0.$(_assemblyBuildNumber)'
-
-  - name: sqlClientPackageVersion
-    ${{ if parameters.isPreview }}:
-      value: '7.1.0-preview1.$(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
-    ${{ if parameters.isPreview }}:
-      value: '1.0.0-preview1.$(Build.BuildNumber)'
-    ${{ else }}:
-      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 70a37e0fa7..98dd98056b 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
@@ -129,6 +132,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 f777626c90..79160eb651 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
@@ -129,6 +132,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..e78f8a7b28
--- /dev/null
+++ b/eng/pipelines/stages/compute-versions-ci-stage.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.
+################################################################################
+
+# 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:
+          # 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
+                pkg=$(echo "$output" | sed -n 's/^ *PackageVersion: //p')
+                file=$(echo "$output" | sed -n 's/^ *FileVersion: //p')
+                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/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 dd9ddc03d5..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-preview1</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 cc6d4ca14a..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>1.1.0-preview1</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 7a39bb808f..0b8b9bf2d8 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 636face4e6..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>1.1.0-preview1</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 9d031d21d0..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>1.1.0-preview1</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 712263b73e..823d1d7bec 100644
--- a/src/Microsoft.Data.SqlClient/Versions.props
+++ b/src/Microsoft.Data.SqlClient/Versions.props
@@ -14,10 +14,15 @@
   -->
 
   <!--
+    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 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.
+    src/Directory.Build.props imports this file for every project, and Directory.Packages.props
+    imports it early in Package mode; the guard prevents re-importing and re-evaluating version
+    properties.
   -->
   <PropertyGroup>
     <SqlClientVersionsImported>true</SqlClientVersionsImported>
@@ -26,10 +31,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-preview1</SqlClientVersionDefault>
+    <SqlClientNextVersion>7.1.0-preview1</SqlClientNextVersion>
   </PropertyGroup>
 
   <!-- Determine file version and package version based on what was provided. -->
@@ -61,10 +67,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 +82,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 06eaf9e914..a54a159921 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
@@ -101,8 +101,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). -->
@@ -146,13 +144,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)')" />
 
@@ -196,27 +192,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 7d94bb7687..87c841c6c6 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" />
@@ -56,8 +56,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" />
@@ -68,8 +68,8 @@
       </group>
       <group targetFramework="net9.0">
         <dependency id="Microsoft.Bcl.Cryptography" version="9.0.13" />
-        <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.13" exclude="Compile" />
         <dependency id="Microsoft.IdentityModel.JsonWebTokens" version="8.16.0" />
@@ -81,8 +81,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 568592072d..3e764ea7ed 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
@@ -806,7 +806,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 a8fcf7ca88..6b04443813 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/UserAgent.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/UserAgent.cs
@@ -145,7 +145,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..82108043eb 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,20 +256,14 @@ private static string GetMdsVersion()
                 return "<unknown>";
             }
 
-            // Look for the NuGetPackageVersion field, which is available in
-            // newer MDS packages.
+            // Look for the PackageVersion field, falling back to FileVersion.
             var field = type.GetField(
-                "NuGetPackageVersion",
+                "PackageVersion",
+                BindingFlags.NonPublic | BindingFlags.Static)
+                ?? type.GetField(
+                "FileVersion",
                 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);
-            }
-
             if (field is null)
             {
                 return "<unknown>";
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 3615bd95a8..fdee1160fa 100644
--- a/src/Microsoft.SqlServer.Server/Versions.props
+++ b/src/Microsoft.SqlServer.Server/Versions.props
@@ -25,12 +25,15 @@
 
   <!-- Set up the default version for fallback if a version is not provided -->
   <PropertyGroup>
+    <!-- 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 when the next version is
       decided.
       @TODO: Determine how versions should be updated in release branches vs main
     -->
-    <SqlServerVersionDefault>1.1.0-preview1</SqlServerVersionDefault>
+    <SqlServerNextVersion>1.1.0-preview1</SqlServerNextVersion>
   </PropertyGroup>
 
   <!-- Determine file version and package version based on what was provided. -->
@@ -62,10 +65,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 +80,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>