From f9f1d87c52b0a8ac91f5a7ac2e447ee6608b37da Mon Sep 17 00:00:00 2001
From: Tyler Butler <tyler@tylerbutler.com>
Date: Tue, 8 Nov 2022 15:03:43 -0800
Subject: [PATCH 01/22] feat(generate:typetests): Make type tests configurable
 per-branch

---
 build-tools/packages/build-cli/README.md      |   2 +-
 .../packages/build-cli/docs/generate.md       |  11 +-
 .../src/commands/generate/typetests.ts        |  67 ++++++-
 build-tools/packages/build-tools/src/index.ts |   1 +
 .../src/typeValidator/packageJson.ts          | 165 +++++++++++++++++-
 build-tools/packages/version-tools/README.md  |   2 +-
 .../api-report/version-tools.api.md           |   2 +-
 .../packages/version-tools/src/semver.ts      |  27 ++-
 8 files changed, 256 insertions(+), 21 deletions(-)

diff --git a/build-tools/packages/build-cli/README.md b/build-tools/packages/build-cli/README.md
index 345654c997d8..aa10cf56b186 100644
--- a/build-tools/packages/build-cli/README.md
+++ b/build-tools/packages/build-cli/README.md
@@ -17,7 +17,7 @@ $ npm install -g @fluid-tools/build-cli
 $ flub COMMAND
 running command...
 $ flub (--version|-V)
-@fluid-tools/build-cli/0.5.0
+@fluid-tools/build-cli/0.6.0
 $ flub --help [COMMAND]
 USAGE
   $ flub COMMAND
diff --git a/build-tools/packages/build-cli/docs/generate.md b/build-tools/packages/build-cli/docs/generate.md
index c11471d0ea4e..58e157ff16b5 100644
--- a/build-tools/packages/build-cli/docs/generate.md
+++ b/build-tools/packages/build-cli/docs/generate.md
@@ -114,18 +114,17 @@ Generates type tests based on the individual package settings in package.json.
 ```
 USAGE
   $ flub generate typetests [-d <value> | --packages | -g client|server|azure|build-tools] [--prepare | --generate]
-    (--exact <value> |  | -s
-    ^previousMajor|^previousMinor|~previousMajor|~previousMinor|previousMajor|previousMinor|baseMinor|baseMajor)
-    [--reset | ] [--generateInName] [-v]
+    [--exact <value> |  | -s ^previousMajor|^previousMinor|~previousMajor|~previousMinor|previousMajor|previousMinor|pre
+    viousPatch|baseMinor|baseMajor|~baseMinor] [--reset | ] [--generateInName] [-v]
 
 FLAGS
   -d, --dir=<value>                 Run on the package in this directory.
   -g, --releaseGroup=<option>       Run on all packages within this release group.
                                     <options: client|server|azure|build-tools>
-  -s, --versionConstraint=<option>  (required) The type of version constraint to use for previous versions. Only applies
-                                    to the prepare phase.
+  -s, --versionConstraint=<option>  The type of version constraint to use for previous versions. Only applies to the
+                                    prepare phase.
                                     <options: ^previousMajor|^previousMinor|~previousMajor|~previousMinor|previousMajor|
-                                    previousMinor|baseMinor|baseMajor>
+                                    previousMinor|previousPatch|baseMinor|baseMajor|~baseMinor>
   -v, --verbose                     Verbose logging.
   --exact=<value>                   An exact string to use as the previous version constraint. The string will be used
                                     as-is. Only applies to the prepare phase.
diff --git a/build-tools/packages/build-cli/src/commands/generate/typetests.ts b/build-tools/packages/build-cli/src/commands/generate/typetests.ts
index 1889b793eb7a..6f69404f071d 100644
--- a/build-tools/packages/build-cli/src/commands/generate/typetests.ts
+++ b/build-tools/packages/build-cli/src/commands/generate/typetests.ts
@@ -5,10 +5,64 @@
 import { CliUx, Flags } from "@oclif/core";
 import chalk from "chalk";
 
-import { generateTests, getAndUpdatePackageDetails } from "@fluidframework/build-tools";
+import {
+    PreviousVersionStyle,
+    generateTests,
+    getAndUpdatePackageDetails,
+} from "@fluidframework/build-tools";
 
 import { BaseCommand } from "../../base";
 import { releaseGroupFlag } from "../../flags";
+import { ReleaseGroup } from "../../releaseGroups";
+
+/**
+ * Returns a default {@link PreviousVersionStyle} for a branch and release group.
+ *
+ * Minor version series branches like lts and main use the ~previousMinor style.
+ * Major version series branches like next use the ^previousMajor style.
+ * Patch version series branches like release branches use the previousPatch style.
+ */
+const getVersionStyleForBranch = (branch: string, releaseGroup: ReleaseGroup): PreviousVersionStyle => {
+    let style: PreviousVersionStyle;
+    switch(releaseGroup) {
+        case "azure": {
+            if (branch === "main") {
+                // main is the major version series branch for azure
+                style = "^previousMajor";
+            } else if (branch === "lts") {
+                // lts is the minor version series branch for azure
+                style = "~previousMinor";
+            } else if (branch.startsWith("release/azure/")) {
+                style = "previousPatch";
+            } else {
+                style = "baseMinor";
+            }
+        }
+
+        default: {
+            if (["main", "lts"].includes(branch)) {
+                style = "~previousMinor";
+            } else if (branch === "next") {
+                style = "^previousMajor";
+            } else if (branch.startsWith("release/")) {
+                style = "previousPatch";
+            } else {
+                style = "baseMinor";
+            }
+        }
+    }
+    if (["main", "lts"].includes(branch)) {
+        style = "~previousMinor";
+    } else if (branch === "next") {
+        style = "^previousMajor";
+    } else if (branch.startsWith("release/")) {
+        style = "previousPatch";
+    } else {
+        style = "baseMinor";
+    }
+
+    return style;
+};
 
 export default class GenerateTypeTestsCommand extends BaseCommand<
     typeof GenerateTypeTestsCommand.flags
@@ -59,10 +113,11 @@ export default class GenerateTypeTestsCommand extends BaseCommand<
                 "~previousMinor",
                 "previousMajor",
                 "previousMinor",
+                "previousPatch",
                 "baseMinor",
                 "baseMajor",
+                "~baseMinor",
             ],
-            required: true,
         }),
         exact: Flags.string({
             description:
@@ -140,6 +195,7 @@ export default class GenerateTypeTestsCommand extends BaseCommand<
             this.info(`Finding package in directory: ${dir}`);
             packageDirs.push(dir);
         } else {
+            // eslint-disable-next-line @typescript-eslint/no-shadow
             const context = await this.getContext();
             if (independentPackages) {
                 this.info(`Finding independent packages`);
@@ -160,8 +216,13 @@ export default class GenerateTypeTestsCommand extends BaseCommand<
             });
         }
 
+        const context = await this.getContext();
         const concurrency = 25;
         const runningGenerates: Promise<boolean>[] = [];
+        const constraint: PreviousVersionStyle =
+            (flags.versionConstraint as any | undefined) ??
+            getVersionStyleForBranch(context.originalBranchName);
+
         // this loop incrementally builds up the runningGenerates promise list
         // each dir with an index greater than concurrency looks back the concurrency value
         // to determine when to run
@@ -186,7 +247,7 @@ export default class GenerateTypeTestsCommand extends BaseCommand<
                         const packageData = await getAndUpdatePackageDetails(
                             packageDir,
                             /* writeUpdates */ runPrepare,
-                            flags.versionConstraint as any,
+                            constraint,
                             flags.exact,
                             flags.reset,
                         ).finally(() => output.push(`Loaded(${Date.now() - start}ms)`));
diff --git a/build-tools/packages/build-tools/src/index.ts b/build-tools/packages/build-tools/src/index.ts
index 5718320ae6f0..dc71e5e27556 100644
--- a/build-tools/packages/build-tools/src/index.ts
+++ b/build-tools/packages/build-tools/src/index.ts
@@ -35,3 +35,4 @@ export { policyHandlers } from "./repoPolicyCheck/handlers";
 export { generateMonoRepoInstallPackageJson } from "./genMonoRepoPackageJson/lib";
 export { findPackagesUnderPath, getAndUpdatePackageDetails } from "./typeValidator/packageJson";
 export { generateTests } from "./typeValidator/testGeneration";
+export { type PreviousVersionStyle } from "./typeValidator/packageJson";
diff --git a/build-tools/packages/build-tools/src/typeValidator/packageJson.ts b/build-tools/packages/build-tools/src/typeValidator/packageJson.ts
index 11cdb0038bbc..2ab8705220e1 100644
--- a/build-tools/packages/build-tools/src/typeValidator/packageJson.ts
+++ b/build-tools/packages/build-tools/src/typeValidator/packageJson.ts
@@ -8,6 +8,7 @@ import * as semver from "semver";
 import * as util from "util";
 
 import {
+    ReleaseVersion,
     fromInternalScheme,
     getPreviousVersions,
     getVersionRange,
@@ -131,6 +132,8 @@ export async function getPackageDetails(packageDir: string): Promise<PackageDeta
 export type PreviousVersionStyle =
     | "baseMajor"
     | "baseMinor"
+    | "~baseMinor"
+    | "previousPatch"
     | "previousMinor"
     | "previousMajor"
     | "^previousMajor"
@@ -138,6 +141,139 @@ export type PreviousVersionStyle =
     | "~previousMajor"
     | "~previousMinor";
 
+function getPreviousVersionBaseline(version: ReleaseVersion, style: PreviousVersionStyle): string {
+    const [previousMajorVersion, previousMinorVersion, previousPatchVersion] =
+        getPreviousVersions(version);
+    let prevVersion: string;
+
+    switch (style) {
+        case "baseMajor": {
+            const sv = semver.parse(version);
+            if (sv === null) {
+                throw new Error(`Cannot parse current version: ${version}`);
+            }
+
+            if (isInternalVersionScheme(sv)) {
+                const [pubVer, intVer] = fromInternalScheme(sv);
+                prevVersion = toInternalScheme(pubVer, `${intVer.major}.0.0`).version;
+            } else {
+                prevVersion = `${sv.major}.0.0`;
+            }
+            break;
+        }
+
+        case "baseMinor": {
+            const sv = semver.parse(version);
+            if (sv === null) {
+                throw new Error(`Cannot parse current version: ${version}`);
+            }
+
+            if (isInternalVersionScheme(sv)) {
+                const [pubVer, intVer] = fromInternalScheme(sv);
+                prevVersion = toInternalScheme(pubVer, `${intVer.major}.${intVer.minor}.0`).version;
+            } else {
+                prevVersion = `${sv.major}.${sv.minor}.0`;
+            }
+
+            break;
+        }
+
+        case "~baseMinor": {
+            const sv = semver.parse(version);
+            if (sv === null) {
+                throw new Error(`Cannot parse current version: ${version}`);
+            }
+
+            if (isInternalVersionScheme(sv)) {
+                const [pubVer, intVer] = fromInternalScheme(sv);
+                const baseMinor = toInternalScheme(pubVer, `${intVer.major}.${intVer.minor}.0`);
+                prevVersion = getVersionRange(baseMinor, "~");
+            } else {
+                prevVersion = `~${sv.major}.${sv.minor}.0`;
+            }
+
+            break;
+        }
+
+        case "previousMajor": {
+            if (previousMajorVersion === undefined) {
+                throw new Error(`Previous major version is undefined.`);
+            }
+
+            prevVersion = previousMajorVersion;
+            break;
+        }
+
+        case "previousMinor": {
+            if (previousMinorVersion === undefined) {
+                throw new Error(`Previous minor version is undefined.`);
+            }
+
+            prevVersion = previousMinorVersion;
+            break;
+        }
+
+        case "previousPatch": {
+            if (previousPatchVersion === undefined) {
+                throw new Error(`Previous patch version is undefined.`);
+            }
+
+            prevVersion = previousPatchVersion;
+            break;
+        }
+
+        case "^previousMajor": {
+            if (previousMajorVersion === undefined) {
+                throw new Error(`Previous major version is undefined.`);
+            }
+
+            prevVersion = isInternalVersionScheme(previousMajorVersion)
+                ? // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                  getVersionRange(previousMajorVersion!, "^")
+                : `^${previousMajorVersion}`;
+            break;
+        }
+
+        case "^previousMinor": {
+            if (previousMinorVersion === undefined) {
+                throw new Error(`Previous minor version is undefined.`);
+            }
+
+            prevVersion = isInternalVersionScheme(previousMinorVersion)
+                ? // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                  getVersionRange(previousMinorVersion!, "^")
+                : `^${previousMinorVersion}`;
+            break;
+        }
+
+        case "~previousMajor": {
+            if (previousMajorVersion === undefined) {
+                throw new Error(`Previous major version is undefined.`);
+            }
+
+            prevVersion = isInternalVersionScheme(previousMajorVersion)
+                ? // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                  getVersionRange(previousMajorVersion!, "~")
+                : `~${previousMajorVersion}`;
+            break;
+        }
+
+        case "~previousMinor": {
+            if (previousMinorVersion === undefined) {
+                throw new Error(`Previous minor version is undefined.`);
+            }
+
+            prevVersion = isInternalVersionScheme(previousMinorVersion)
+                ? // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                  getVersionRange(previousMinorVersion!, "~")
+                : `~${previousMinorVersion}`;
+            break;
+        }
+    }
+
+    return prevVersion;
+}
+
 /**
  * Based on the current version of the package as per package.json, determines the previous version that we should run
  * typetests against.
@@ -184,7 +320,8 @@ export async function getAndUpdatePackageDetails(
     let prevVersion: string;
 
     if (exactPreviousVersionString === undefined) {
-        const [previousMajorVersion, previousMinorVersion] = getPreviousVersions(version);
+        const [previousMajorVersion, previousMinorVersion, previousPatchVersion] =
+            getPreviousVersions(version);
         switch (previousVersionStyle) {
             case "baseMajor": {
                 const sv = semver.parse(version);
@@ -220,6 +357,23 @@ export async function getAndUpdatePackageDetails(
                 break;
             }
 
+            case "~baseMinor": {
+                const sv = semver.parse(version);
+                if (sv === null) {
+                    throw new Error(`Cannot parse current version: ${version}`);
+                }
+
+                if (isInternalVersionScheme(sv)) {
+                    const [pubVer, intVer] = fromInternalScheme(sv);
+                    const baseMinor = toInternalScheme(pubVer, `${intVer.major}.${intVer.minor}.0`);
+                    prevVersion = getVersionRange(baseMinor, "~");
+                } else {
+                    prevVersion = `~${sv.major}.${sv.minor}.0`;
+                }
+
+                break;
+            }
+
             case "previousMajor": {
                 if (previousMajorVersion === undefined) {
                     throw new Error(`Previous major version is undefined.`);
@@ -238,6 +392,15 @@ export async function getAndUpdatePackageDetails(
                 break;
             }
 
+            case "previousPatch": {
+                if (previousPatchVersion === undefined) {
+                    throw new Error(`Previous patch version is undefined.`);
+                }
+
+                prevVersion = previousPatchVersion;
+                break;
+            }
+
             case "^previousMajor": {
                 if (previousMajorVersion === undefined) {
                     throw new Error(`Previous major version is undefined.`);
diff --git a/build-tools/packages/version-tools/README.md b/build-tools/packages/version-tools/README.md
index 8fbed4d1b5cf..e2470aa3794a 100644
--- a/build-tools/packages/version-tools/README.md
+++ b/build-tools/packages/version-tools/README.md
@@ -74,7 +74,7 @@ $ npm install -g @fluid-tools/version-tools
 $ fluv COMMAND
 running command...
 $ fluv (--version|-V)
-@fluid-tools/version-tools/0.5.0
+@fluid-tools/version-tools/0.6.0
 $ fluv --help [COMMAND]
 USAGE
   $ fluv COMMAND
diff --git a/build-tools/packages/version-tools/api-report/version-tools.api.md b/build-tools/packages/version-tools/api-report/version-tools.api.md
index c3ba8a9ce39c..979b065e26dd 100644
--- a/build-tools/packages/version-tools/api-report/version-tools.api.md
+++ b/build-tools/packages/version-tools/api-report/version-tools.api.md
@@ -32,7 +32,7 @@ export function fromVirtualPatchScheme(virtualPatchVersion: semver.SemVer | stri
 export function getLatestReleaseFromList(versionList: string[], allowPrereleases?: boolean): string;
 
 // @public
-export function getPreviousVersions(version: ReleaseVersion): [ReleaseVersion | undefined, ReleaseVersion | undefined];
+export function getPreviousVersions(version: ReleaseVersion): [ReleaseVersion | undefined, ReleaseVersion | undefined, ReleaseVersion | undefined];
 
 // @public
 export function getVersionRange(version: semver.SemVer | string, maxAutomaticBump: "minor" | "patch" | "~" | "^"): string;
diff --git a/build-tools/packages/version-tools/src/semver.ts b/build-tools/packages/version-tools/src/semver.ts
index fe21a352ccb8..99ae6c639500 100644
--- a/build-tools/packages/version-tools/src/semver.ts
+++ b/build-tools/packages/version-tools/src/semver.ts
@@ -216,10 +216,11 @@ export function isPrereleaseVersion(version: string | semver.SemVer | undefined)
  */
 export function getPreviousVersions(
     version: ReleaseVersion,
-): [ReleaseVersion | undefined, ReleaseVersion | undefined] {
+): [ReleaseVersion | undefined, ReleaseVersion | undefined, ReleaseVersion | undefined] {
     const scheme = detectVersionScheme(version);
     let previousMajorVersion: ReleaseVersion | undefined;
     let previousMinorVersion: ReleaseVersion | undefined;
+    let previousPatchVersion: ReleaseVersion | undefined;
 
     if (scheme === "internal") {
         const [pubVer, intVer] = fromInternalScheme(version);
@@ -232,12 +233,15 @@ export function getPreviousVersions(
                 ? "1.0.0"
                 : toInternalScheme(pubVer, `${intVer.major - 1}.0.0`).version;
 
-        previousMinorVersion =
-            intVer.minor === 0
-                ? toInternalScheme(pubVer, `${intVer.major}.${Math.max(0, intVer.minor - 1)}.0`)
-                      .version
-                : toInternalScheme(pubVer, `${intVer.major}.${Math.max(0, intVer.minor - 1)}.0`)
-                      .version;
+        previousMinorVersion = toInternalScheme(
+            pubVer,
+            `${intVer.major}.${Math.max(0, intVer.minor - 1)}.0`,
+        ).version;
+
+        previousPatchVersion = toInternalScheme(
+            pubVer,
+            `${intVer.major}.${intVer.minor}.${Math.max(0, intVer.patch - 1)}`,
+        ).version;
     } else if (scheme === "virtualPatch") {
         const ver = fromVirtualPatchScheme(version);
         if (ver.major <= 1) {
@@ -247,6 +251,9 @@ export function getPreviousVersions(
         previousMinorVersion = toVirtualPatchScheme(
             `${ver.major}.${Math.max(0, ver.minor - 1)}.0`,
         ).version;
+        previousPatchVersion = toVirtualPatchScheme(
+            `${ver.major}.${ver.minor}.${Math.max(0, ver.patch - 1)}`,
+        ).version;
     } else {
         const ver = semver.parse(version);
         if (ver === null) {
@@ -258,7 +265,11 @@ export function getPreviousVersions(
             ver.minor === 0 && ver.major === 0
                 ? undefined
                 : `${ver.major}.${Math.max(0, ver.minor - 1)}.0`;
+        previousPatchVersion =
+            ver.minor === 0 && ver.major === 0 && ver.patch === 0
+                ? undefined
+                : `${ver.major}.${ver.minor}.${Math.max(0, ver.patch - 1)}`;
     }
 
-    return [previousMajorVersion, previousMinorVersion];
+    return [previousMajorVersion, previousMinorVersion, previousPatchVersion];
 }

From 33dbc02e864cb4d5d97425650303f543ca4d2d4f Mon Sep 17 00:00:00 2001
From: Tyler Butler <tyler@tylerbutler.com>
Date: Wed, 9 Nov 2022 18:36:31 -0800
Subject: [PATCH 02/22] updates

---
 .../src/commands/generate/typetests.ts        |  56 +----
 .../src/typeValidator/packageJson.ts          | 196 ++++++------------
 .../src/typeValidator/typeValidator.ts        |  76 +------
 3 files changed, 70 insertions(+), 258 deletions(-)

diff --git a/build-tools/packages/build-cli/src/commands/generate/typetests.ts b/build-tools/packages/build-cli/src/commands/generate/typetests.ts
index 6f69404f071d..cda261e7d927 100644
--- a/build-tools/packages/build-cli/src/commands/generate/typetests.ts
+++ b/build-tools/packages/build-cli/src/commands/generate/typetests.ts
@@ -13,56 +13,6 @@ import {
 
 import { BaseCommand } from "../../base";
 import { releaseGroupFlag } from "../../flags";
-import { ReleaseGroup } from "../../releaseGroups";
-
-/**
- * Returns a default {@link PreviousVersionStyle} for a branch and release group.
- *
- * Minor version series branches like lts and main use the ~previousMinor style.
- * Major version series branches like next use the ^previousMajor style.
- * Patch version series branches like release branches use the previousPatch style.
- */
-const getVersionStyleForBranch = (branch: string, releaseGroup: ReleaseGroup): PreviousVersionStyle => {
-    let style: PreviousVersionStyle;
-    switch(releaseGroup) {
-        case "azure": {
-            if (branch === "main") {
-                // main is the major version series branch for azure
-                style = "^previousMajor";
-            } else if (branch === "lts") {
-                // lts is the minor version series branch for azure
-                style = "~previousMinor";
-            } else if (branch.startsWith("release/azure/")) {
-                style = "previousPatch";
-            } else {
-                style = "baseMinor";
-            }
-        }
-
-        default: {
-            if (["main", "lts"].includes(branch)) {
-                style = "~previousMinor";
-            } else if (branch === "next") {
-                style = "^previousMajor";
-            } else if (branch.startsWith("release/")) {
-                style = "previousPatch";
-            } else {
-                style = "baseMinor";
-            }
-        }
-    }
-    if (["main", "lts"].includes(branch)) {
-        style = "~previousMinor";
-    } else if (branch === "next") {
-        style = "^previousMajor";
-    } else if (branch.startsWith("release/")) {
-        style = "previousPatch";
-    } else {
-        style = "baseMinor";
-    }
-
-    return style;
-};
 
 export default class GenerateTypeTestsCommand extends BaseCommand<
     typeof GenerateTypeTestsCommand.flags
@@ -219,9 +169,6 @@ export default class GenerateTypeTestsCommand extends BaseCommand<
         const context = await this.getContext();
         const concurrency = 25;
         const runningGenerates: Promise<boolean>[] = [];
-        const constraint: PreviousVersionStyle =
-            (flags.versionConstraint as any | undefined) ??
-            getVersionStyleForBranch(context.originalBranchName);
 
         // this loop incrementally builds up the runningGenerates promise list
         // each dir with an index greater than concurrency looks back the concurrency value
@@ -245,9 +192,10 @@ export default class GenerateTypeTestsCommand extends BaseCommand<
                     try {
                         const start = Date.now();
                         const packageData = await getAndUpdatePackageDetails(
+                            context,
                             packageDir,
                             /* writeUpdates */ runPrepare,
-                            constraint,
+                            flags.versionConstraint as PreviousVersionStyle | undefined,
                             flags.exact,
                             flags.reset,
                         ).finally(() => output.push(`Loaded(${Date.now() - start}ms)`));
diff --git a/build-tools/packages/build-tools/src/typeValidator/packageJson.ts b/build-tools/packages/build-tools/src/typeValidator/packageJson.ts
index 2ab8705220e1..df4ae53d33b9 100644
--- a/build-tools/packages/build-tools/src/typeValidator/packageJson.ts
+++ b/build-tools/packages/build-tools/src/typeValidator/packageJson.ts
@@ -16,6 +16,9 @@ import {
     toInternalScheme,
 } from "@fluid-tools/version-tools";
 
+import { Context } from "../bumpVersion/context";
+import { MonoRepoKind } from "../common/monoRepo";
+
 export type PackageDetails = {
     readonly packageDir: string;
     readonly oldVersions: readonly string[];
@@ -274,6 +277,59 @@ function getPreviousVersionBaseline(version: ReleaseVersion, style: PreviousVers
     return prevVersion;
 }
 
+/**
+ * Returns a default {@link PreviousVersionStyle} for a branch and release group.
+ *
+ * Minor version series branches like lts and main use the ~previousMinor style.
+ * Major version series branches like next use the ^previousMajor style.
+ * Patch version series branches like release branches use the previousPatch style.
+ */
+const getVersionStyleForBranch = (
+    branch: string,
+    releaseGroup?: MonoRepoKind,
+): PreviousVersionStyle => {
+    let style: PreviousVersionStyle;
+    switch (releaseGroup) {
+        case "azure": {
+            if (branch === "main") {
+                // main is the major version series branch for azure
+                style = "^previousMajor";
+            } else if (branch === "lts") {
+                // lts is the minor version series branch for azure
+                style = "~previousMinor";
+            } else if (branch.startsWith("release/azure/")) {
+                style = "previousPatch";
+            } else {
+                style = "baseMinor";
+            }
+            break;
+        }
+
+        default: {
+            if (["main", "lts"].includes(branch)) {
+                style = "~previousMinor";
+            } else if (branch === "next") {
+                style = "^previousMajor";
+            } else if (branch.startsWith("release/")) {
+                style = "previousPatch";
+            } else {
+                style = "baseMinor";
+            }
+        }
+    }
+    if (["main", "lts"].includes(branch)) {
+        style = "~previousMinor";
+    } else if (branch === "next") {
+        style = "^previousMajor";
+    } else if (branch.startsWith("release/")) {
+        style = "previousPatch";
+    } else {
+        style = "baseMinor";
+    }
+
+    return style;
+};
+
 /**
  * Based on the current version of the package as per package.json, determines the previous version that we should run
  * typetests against.
@@ -293,13 +349,21 @@ function getPreviousVersionBaseline(version: ReleaseVersion, style: PreviousVers
  * @internal
  */
 export async function getAndUpdatePackageDetails(
+    context: Context,
     packageDir: string,
     writeUpdates: boolean | undefined,
-    previousVersionStyle: PreviousVersionStyle,
+    previousVersionStyle?: PreviousVersionStyle,
     exactPreviousVersionString?: string,
     resetBroken?: boolean,
 ): Promise<(PackageDetails & { skipReason?: undefined }) | { skipReason: string }> {
     const packageDetails = await getPackageDetails(packageDir);
+    const pkg = context.fullPackageMap.get(packageDetails.pkg.name);
+    if (pkg === undefined) {
+        return { skipReason: "Skipping package: not found in context" };
+    }
+    const constraint: PreviousVersionStyle =
+        previousVersionStyle ??
+        getVersionStyleForBranch(context.originalBranchName, pkg.monoRepo?.kind);
 
     if (packageDetails.pkg.name.startsWith("@fluid-internal")) {
         // @fluid-internal packages are intended for internal use only and are not typically published. We don't make
@@ -320,135 +384,7 @@ export async function getAndUpdatePackageDetails(
     let prevVersion: string;
 
     if (exactPreviousVersionString === undefined) {
-        const [previousMajorVersion, previousMinorVersion, previousPatchVersion] =
-            getPreviousVersions(version);
-        switch (previousVersionStyle) {
-            case "baseMajor": {
-                const sv = semver.parse(version);
-                if (sv === null) {
-                    throw new Error(`Cannot parse current version: ${version}`);
-                }
-
-                if (isInternalVersionScheme(sv)) {
-                    const [pubVer, intVer] = fromInternalScheme(sv);
-                    prevVersion = toInternalScheme(pubVer, `${intVer.major}.0.0`).version;
-                } else {
-                    prevVersion = `${sv.major}.0.0`;
-                }
-                break;
-            }
-
-            case "baseMinor": {
-                const sv = semver.parse(version);
-                if (sv === null) {
-                    throw new Error(`Cannot parse current version: ${version}`);
-                }
-
-                if (isInternalVersionScheme(sv)) {
-                    const [pubVer, intVer] = fromInternalScheme(sv);
-                    prevVersion = toInternalScheme(
-                        pubVer,
-                        `${intVer.major}.${intVer.minor}.0`,
-                    ).version;
-                } else {
-                    prevVersion = `${sv.major}.${sv.minor}.0`;
-                }
-
-                break;
-            }
-
-            case "~baseMinor": {
-                const sv = semver.parse(version);
-                if (sv === null) {
-                    throw new Error(`Cannot parse current version: ${version}`);
-                }
-
-                if (isInternalVersionScheme(sv)) {
-                    const [pubVer, intVer] = fromInternalScheme(sv);
-                    const baseMinor = toInternalScheme(pubVer, `${intVer.major}.${intVer.minor}.0`);
-                    prevVersion = getVersionRange(baseMinor, "~");
-                } else {
-                    prevVersion = `~${sv.major}.${sv.minor}.0`;
-                }
-
-                break;
-            }
-
-            case "previousMajor": {
-                if (previousMajorVersion === undefined) {
-                    throw new Error(`Previous major version is undefined.`);
-                }
-
-                prevVersion = previousMajorVersion;
-                break;
-            }
-
-            case "previousMinor": {
-                if (previousMinorVersion === undefined) {
-                    throw new Error(`Previous minor version is undefined.`);
-                }
-
-                prevVersion = previousMinorVersion;
-                break;
-            }
-
-            case "previousPatch": {
-                if (previousPatchVersion === undefined) {
-                    throw new Error(`Previous patch version is undefined.`);
-                }
-
-                prevVersion = previousPatchVersion;
-                break;
-            }
-
-            case "^previousMajor": {
-                if (previousMajorVersion === undefined) {
-                    throw new Error(`Previous major version is undefined.`);
-                }
-
-                prevVersion = isInternalVersionScheme(previousMajorVersion)
-                    ? // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                      getVersionRange(previousMajorVersion!, "^")
-                    : `^${previousMajorVersion}`;
-                break;
-            }
-
-            case "^previousMinor": {
-                if (previousMinorVersion === undefined) {
-                    throw new Error(`Previous minor version is undefined.`);
-                }
-
-                prevVersion = isInternalVersionScheme(previousMinorVersion)
-                    ? // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                      getVersionRange(previousMinorVersion!, "^")
-                    : `^${previousMinorVersion}`;
-                break;
-            }
-
-            case "~previousMajor": {
-                if (previousMajorVersion === undefined) {
-                    throw new Error(`Previous major version is undefined.`);
-                }
-
-                prevVersion = isInternalVersionScheme(previousMajorVersion)
-                    ? // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                      getVersionRange(previousMajorVersion!, "~")
-                    : `~${previousMajorVersion}`;
-                break;
-            }
-
-            case "~previousMinor": {
-                if (previousMinorVersion === undefined) {
-                    throw new Error(`Previous minor version is undefined.`);
-                }
-
-                prevVersion = isInternalVersionScheme(previousMinorVersion)
-                    ? // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                      getVersionRange(previousMinorVersion!, "~")
-                    : `~${previousMinorVersion}`;
-                break;
-            }
-        }
+        prevVersion = getPreviousVersionBaseline(version, constraint);
     } else {
         prevVersion = exactPreviousVersionString;
     }
diff --git a/build-tools/packages/build-tools/src/typeValidator/typeValidator.ts b/build-tools/packages/build-tools/src/typeValidator/typeValidator.ts
index 6b1680fa6703..70787ac526be 100644
--- a/build-tools/packages/build-tools/src/typeValidator/typeValidator.ts
+++ b/build-tools/packages/build-tools/src/typeValidator/typeValidator.ts
@@ -28,81 +28,9 @@ program
     .option("-v|--verbose", "Verbose logging mode")
     .parse(process.argv);
 
-function writeOutLine(output: string) {
-    if (program.verbose) {
-        console.log(output);
-    }
-}
-
 async function run(): Promise<boolean> {
-    const packageDirs: string[] = [];
-    if (program.monoRepoDir) {
-        writeOutLine(`Finding packages in mono repo ${program.monoRepoDir}`);
-        packageDirs.push(...(await findPackagesUnderPath(program.monoRepoDir)));
-    } else if (program.packageDir) {
-        writeOutLine(`${program.packageDir}`);
-        packageDirs.push(program.packageDir);
-    } else {
-        console.log(program.helpInformation());
-        return false;
-    }
-
-    writeOutLine(`preinstallOnly: ${program.preinstallOnly}`);
-    writeOutLine(`generateOnly: ${program.generateOnly}`);
-
-    const concurrency = 25;
-    const runningGenerates: Promise<boolean>[] = [];
-    // this loop incrementally builds up the runningGenerates promise list
-    // each dir with an index greater than concurrency looks back the concurrency value
-    // to determine when to run
-    packageDirs.forEach((packageDir, i) =>
-        runningGenerates.push(
-            (async () => {
-                if (i >= concurrency) {
-                    await runningGenerates[i - concurrency];
-                }
-                const packageName = packageDir.substring(packageDir.lastIndexOf("/") + 1);
-                const output = [`${(i + 1).toString()}/${packageDirs.length}`, `${packageName}`];
-                try {
-                    const start = Date.now();
-                    const packageData = await getAndUpdatePackageDetails(
-                        packageDir,
-                        program.generateOnly === true,
-                        "baseMinor",
-                    ).finally(() => output.push(`Loaded(${Date.now() - start}ms)`));
-                    if (packageData.skipReason !== undefined) {
-                        output.push(packageData.skipReason);
-                    } else if (
-                        packageData.oldVersions.length > 0 &&
-                        program.preinstallOnly === undefined
-                    ) {
-                        const start = Date.now();
-                        await generateTests(packageData, program.generateInName ?? false)
-                            .then((s) =>
-                                output.push(`dirs(${s.dirs}) files(${s.files}) tests(${s.tests})`),
-                            )
-                            .finally(() => output.push(`Generated(${Date.now() - start}ms)`));
-                    }
-                    output.push("Done");
-                } catch (error) {
-                    output.push("Error");
-                    if (typeof error === "string") {
-                        output.push(error);
-                    } else if (error instanceof Error) {
-                        output.push(error.message, `\n ${error.stack}`);
-                    } else {
-                        output.push(typeof error, `${error}`);
-                    }
-                    return false;
-                } finally {
-                    writeOutLine(output.join(": "));
-                }
-                return true;
-            })(),
-        ),
-    );
-
-    return (await Promise.all(runningGenerates)).every((v) => v);
+    console.error(`fluid-type-validator is deprecated. Install @fluid-tools/build-cli instead and use 'flub generate typetests.`);
+    return false;
 }
 
 run()

From 15d724c2c230a6bd8984a577a8653b37b716456d Mon Sep 17 00:00:00 2001
From: Tyler Butler <tyler@tylerbutler.com>
Date: Wed, 9 Nov 2022 18:38:04 -0800
Subject: [PATCH 03/22] formatting

---
 .../build-tools/src/typeValidator/typeValidator.ts         | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/build-tools/packages/build-tools/src/typeValidator/typeValidator.ts b/build-tools/packages/build-tools/src/typeValidator/typeValidator.ts
index 70787ac526be..029840bc6bee 100644
--- a/build-tools/packages/build-tools/src/typeValidator/typeValidator.ts
+++ b/build-tools/packages/build-tools/src/typeValidator/typeValidator.ts
@@ -4,9 +4,6 @@
  */
 import program from "commander";
 
-import { findPackagesUnderPath, getAndUpdatePackageDetails } from "./packageJson";
-import { generateTests } from "./testGeneration";
-
 /**
  * argument parsing
  */
@@ -29,7 +26,9 @@ program
     .parse(process.argv);
 
 async function run(): Promise<boolean> {
-    console.error(`fluid-type-validator is deprecated. Install @fluid-tools/build-cli instead and use 'flub generate typetests.`);
+    console.error(
+        `fluid-type-validator is deprecated. Install @fluid-tools/build-cli instead and use 'flub generate typetests.`,
+    );
     return false;
 }
 

From f4d713faf0233f1c68b20a957ff4a32cb0a7b0f3 Mon Sep 17 00:00:00 2001
From: Tyler Butler <tyler@tylerbutler.com>
Date: Thu, 10 Nov 2022 18:28:42 -0800
Subject: [PATCH 04/22] updates

---
 .../build-tools/src/bumpVersion/context.ts    |   2 +-
 .../build-tools/src/common/fluidRepo.ts       |   5 +
 .../src/typeValidator/packageJson.ts          | 103 ++++++++----------
 package.json                                  |  17 ++-
 4 files changed, 66 insertions(+), 61 deletions(-)

diff --git a/build-tools/packages/build-tools/src/bumpVersion/context.ts b/build-tools/packages/build-tools/src/bumpVersion/context.ts
index 8fdea67b244c..377754374f9c 100644
--- a/build-tools/packages/build-tools/src/bumpVersion/context.ts
+++ b/build-tools/packages/build-tools/src/bumpVersion/context.ts
@@ -23,7 +23,7 @@ export class Context {
     public readonly fullPackageMap: Map<string, Package>;
 
     private readonly timer: Timer;
-    private readonly packageManifest: IPackageManifest;
+    public readonly packageManifest: IPackageManifest;
     private readonly newBranches: string[] = [];
     private readonly newTags: string[] = [];
 
diff --git a/build-tools/packages/build-tools/src/common/fluidRepo.ts b/build-tools/packages/build-tools/src/common/fluidRepo.ts
index b01e064a7917..5dbd05cf10de 100644
--- a/build-tools/packages/build-tools/src/common/fluidRepo.ts
+++ b/build-tools/packages/build-tools/src/common/fluidRepo.ts
@@ -4,6 +4,8 @@
  */
 import * as path from "path";
 
+import { VersionBumpType } from "@fluid-tools/version-tools";
+
 import { getPackageManifest } from "./fluidUtils";
 import { Logger, defaultLogger } from "./logging";
 import { MonoRepo, MonoRepoKind, isMonoRepoKind } from "./monoRepo";
@@ -33,6 +35,9 @@ export interface PolicyConfig {
 export interface IFluidRepoPackage {
     directory: string;
     ignoredDirs?: string[];
+    branchReleaseTypes?: {
+        [name: string]: VersionBumpType;
+    };
 }
 
 export type IFluidRepoPackageEntry = string | IFluidRepoPackage | (string | IFluidRepoPackage)[];
diff --git a/build-tools/packages/build-tools/src/typeValidator/packageJson.ts b/build-tools/packages/build-tools/src/typeValidator/packageJson.ts
index df4ae53d33b9..d8893e04cc97 100644
--- a/build-tools/packages/build-tools/src/typeValidator/packageJson.ts
+++ b/build-tools/packages/build-tools/src/typeValidator/packageJson.ts
@@ -9,6 +9,7 @@ import * as util from "util";
 
 import {
     ReleaseVersion,
+    VersionBumpType,
     fromInternalScheme,
     getPreviousVersions,
     getVersionRange,
@@ -17,7 +18,10 @@ import {
 } from "@fluid-tools/version-tools";
 
 import { Context } from "../bumpVersion/context";
+import { IFluidRepoPackage } from "../common/fluidRepo";
+import { getPackageManifest } from "../common/fluidUtils";
 import { MonoRepoKind } from "../common/monoRepo";
+import { Package } from "../common/npmPackage";
 
 export type PackageDetails = {
     readonly packageDir: string;
@@ -110,6 +114,8 @@ export async function getPackageDetails(packageDir: string): Promise<PackageDeta
  *
  * baseMajor: 2.0.0-internal.2.0.0
  * baseMinor: 2.0.0-internal.2.3.0
+ * ~baseMinor: >=2.0.0-internal.2.3.0 <2.0.0-internal.3.0.0
+ * previousPatch: 2.0.0-internal.2.3.4
  * previousMajor: 2.0.0-internal.1.0.0
  * previousMinor: 2.0.0-internal.2.2.0
  * ^previousMajor: >=2.0.0-internal.1.0.0 <2.0.0-internal.2.0.0
@@ -123,6 +129,8 @@ export async function getPackageDetails(packageDir: string): Promise<PackageDeta
  *
  * baseMajor: 2.0.0-internal.2.0.0
  * baseMinor: 2.0.0-internal.2.0.0
+ * ~baseMinor: >=2.0.0-internal.2.0.0 <2.0.0-internal.2.1.0
+ * previousPatch: 2.0.0-internal.2.0.0
  * previousMajor: 2.0.0-internal.1.0.0
  * previousMinor: 2.0.0-internal.2.0.0
  * ^previousMajor: >=2.0.0-internal.1.0.0 <2.0.0-internal.2.0.0
@@ -144,6 +152,13 @@ export type PreviousVersionStyle =
     | "~previousMajor"
     | "~previousMinor";
 
+/**
+ * Calculates the correct version baseline to use for typetests based on the {@link PreviousVersionStyle}.
+ *
+ * @param version - The version.
+ * @param style - The version style to calculate.
+ * @returns A valid semver version range for the previous version.
+ */
 function getPreviousVersionBaseline(version: ReleaseVersion, style: PreviousVersionStyle): string {
     const [previousMajorVersion, previousMinorVersion, previousPatchVersion] =
         getPreviousVersions(version);
@@ -277,59 +292,6 @@ function getPreviousVersionBaseline(version: ReleaseVersion, style: PreviousVers
     return prevVersion;
 }
 
-/**
- * Returns a default {@link PreviousVersionStyle} for a branch and release group.
- *
- * Minor version series branches like lts and main use the ~previousMinor style.
- * Major version series branches like next use the ^previousMajor style.
- * Patch version series branches like release branches use the previousPatch style.
- */
-const getVersionStyleForBranch = (
-    branch: string,
-    releaseGroup?: MonoRepoKind,
-): PreviousVersionStyle => {
-    let style: PreviousVersionStyle;
-    switch (releaseGroup) {
-        case "azure": {
-            if (branch === "main") {
-                // main is the major version series branch for azure
-                style = "^previousMajor";
-            } else if (branch === "lts") {
-                // lts is the minor version series branch for azure
-                style = "~previousMinor";
-            } else if (branch.startsWith("release/azure/")) {
-                style = "previousPatch";
-            } else {
-                style = "baseMinor";
-            }
-            break;
-        }
-
-        default: {
-            if (["main", "lts"].includes(branch)) {
-                style = "~previousMinor";
-            } else if (branch === "next") {
-                style = "^previousMajor";
-            } else if (branch.startsWith("release/")) {
-                style = "previousPatch";
-            } else {
-                style = "baseMinor";
-            }
-        }
-    }
-    if (["main", "lts"].includes(branch)) {
-        style = "~previousMinor";
-    } else if (branch === "next") {
-        style = "^previousMajor";
-    } else if (branch.startsWith("release/")) {
-        style = "previousPatch";
-    } else {
-        style = "baseMinor";
-    }
-
-    return style;
-};
-
 /**
  * Based on the current version of the package as per package.json, determines the previous version that we should run
  * typetests against.
@@ -352,7 +314,7 @@ export async function getAndUpdatePackageDetails(
     context: Context,
     packageDir: string,
     writeUpdates: boolean | undefined,
-    previousVersionStyle?: PreviousVersionStyle,
+    style?: PreviousVersionStyle,
     exactPreviousVersionString?: string,
     resetBroken?: boolean,
 ): Promise<(PackageDetails & { skipReason?: undefined }) | { skipReason: string }> {
@@ -361,9 +323,31 @@ export async function getAndUpdatePackageDetails(
     if (pkg === undefined) {
         return { skipReason: "Skipping package: not found in context" };
     }
-    const constraint: PreviousVersionStyle =
-        previousVersionStyle ??
-        getVersionStyleForBranch(context.originalBranchName, pkg.monoRepo?.kind);
+
+    const releaseGroup = pkg.monoRepo?.kind;
+    if (releaseGroup === undefined || pkg.monoRepo === undefined) {
+        return { skipReason: `Package has no release group: ${pkg.name}` };
+    }
+
+    const config = context.packageManifest.repoPackages[pkg.monoRepo.kind];
+    let releaseType: VersionBumpType | undefined;
+
+    if (typeof config === "object") {
+        const rpg = config as IFluidRepoPackage;
+        releaseType = rpg.branchReleaseTypes?.[
+            context.originalBranchName
+        ];
+    }
+
+    const previousVersionStyle: PreviousVersionStyle | undefined =
+        style ??
+        (releaseType === "major"
+            ? "^previousMajor"
+            : releaseType === "minor"
+            ? "~previousMinor"
+            : releaseType === "patch"
+            ? "previousPatch"
+            : undefined);
 
     if (packageDetails.pkg.name.startsWith("@fluid-internal")) {
         // @fluid-internal packages are intended for internal use only and are not typically published. We don't make
@@ -378,13 +362,16 @@ export async function getAndUpdatePackageDetails(
     } else if (packageDetails.pkg.typeValidation?.disabled === true) {
         // Packages can explicitly opt out of type tests by setting typeValidation.disabled to true.
         return { skipReason: "Skipping package: type validation disabled" };
+    } else if (previousVersionStyle === undefined) {
+        // Skip if there's no previous version style defined for the package.
+        return { skipReason: "Skipping package: previousVersionStyle is undefined" };
     }
 
     const version = packageDetails.pkg.version;
     let prevVersion: string;
 
     if (exactPreviousVersionString === undefined) {
-        prevVersion = getPreviousVersionBaseline(version, constraint);
+        prevVersion = getPreviousVersionBaseline(version, previousVersionStyle);
     } else {
         prevVersion = exactPreviousVersionString;
     }
diff --git a/package.json b/package.json
index c2d7bac17b71..9a622bd27018 100644
--- a/package.json
+++ b/package.json
@@ -138,12 +138,25 @@
       "common-def": "common/lib/common-definitions",
       "common-utils": "common/lib/common-utils",
       "protocol-def": "common/lib/protocol-definitions",
-      "azure": "azure",
+      "azure": {
+        "directory": "azure",
+        "branchReleaseTypes": {
+          "main": "major",
+          "lts": "minor",
+          "release/*": "patch"
+        }
+      },
       "build-tools": "build-tools",
       "server": "server/routerlicious",
       "client": {
         "directory": "",
-        "ignoredDirs": []
+        "ignoredDirs": [],
+        "branchReleaseTypes": {
+          "main": "minor",
+          "lts": "minor",
+          "release/*": "patch",
+          "next": "major"
+        }
       },
       "tools": [
         "tools/api-markdown-documenter",

From f600918472f123404f63ce1b76dea183859db442 Mon Sep 17 00:00:00 2001
From: Tyler Butler <tyler@tylerbutler.com>
Date: Thu, 10 Nov 2022 18:29:27 -0800
Subject: [PATCH 05/22] updates

---
 .../packages/build-tools/src/typeValidator/packageJson.ts     | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/build-tools/packages/build-tools/src/typeValidator/packageJson.ts b/build-tools/packages/build-tools/src/typeValidator/packageJson.ts
index d8893e04cc97..0f32ad60ecc8 100644
--- a/build-tools/packages/build-tools/src/typeValidator/packageJson.ts
+++ b/build-tools/packages/build-tools/src/typeValidator/packageJson.ts
@@ -334,9 +334,7 @@ export async function getAndUpdatePackageDetails(
 
     if (typeof config === "object") {
         const rpg = config as IFluidRepoPackage;
-        releaseType = rpg.branchReleaseTypes?.[
-            context.originalBranchName
-        ];
+        releaseType = rpg.branchReleaseTypes?.[context.originalBranchName];
     }
 
     const previousVersionStyle: PreviousVersionStyle | undefined =

From 55246d0e3f906004ab7eda62e9c4ad4f907f6970 Mon Sep 17 00:00:00 2001
From: Tyler Butler <tyler@tylerbutler.com>
Date: Fri, 11 Nov 2022 09:06:42 -0800
Subject: [PATCH 06/22] policy

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index 9a622bd27018..3de6fa028b66 100644
--- a/package.json
+++ b/package.json
@@ -190,6 +190,7 @@
         ]
       },
       "additionalLockfilePaths": [
+        "azure",
         "common/build/build-common",
         "common/build/eslint-config-fluid",
         "docs",

From 63fb83256463cc18ce1e96014b6a977a3dbc1307 Mon Sep 17 00:00:00 2001
From: Tyler Butler <tyler@tylerbutler.com>
Date: Fri, 11 Nov 2022 12:18:24 -0800
Subject: [PATCH 07/22] updates

---
 build-tools/packages/build-cli/.eslintrc.cjs  |  3 +
 .../packages/build-cli/docs/generate.md       |  5 +-
 .../build-cli/docs/typetestDetails.md         | 90 +++++++++++++++++++
 .../src/commands/generate/typetests.ts        |  9 +-
 build-tools/packages/version-tools/README.md  |  4 +-
 5 files changed, 104 insertions(+), 7 deletions(-)
 create mode 100644 build-tools/packages/build-cli/docs/typetestDetails.md

diff --git a/build-tools/packages/build-cli/.eslintrc.cjs b/build-tools/packages/build-cli/.eslintrc.cjs
index 8ca637a90c79..8773ed167708 100644
--- a/build-tools/packages/build-cli/.eslintrc.cjs
+++ b/build-tools/packages/build-cli/.eslintrc.cjs
@@ -26,6 +26,9 @@ module.exports = {
             {
                 allow: [
                     "@oclif/core/lib/interfaces",
+                    "@oclif/core/lib/util",
+                    "oclif/lib/commands/**",
+                    "oclif/lib/util",
                     "npm-check-updates/build/src/types/**",
                     "**/commands/**",
                 ],
diff --git a/build-tools/packages/build-cli/docs/generate.md b/build-tools/packages/build-cli/docs/generate.md
index 58e157ff16b5..5cdb484c851b 100644
--- a/build-tools/packages/build-cli/docs/generate.md
+++ b/build-tools/packages/build-cli/docs/generate.md
@@ -150,7 +150,10 @@ DESCRIPTION
   preparation. This is useful when resetting the type tests to a clean state, such as after a major release.
 
   Generating test modules takes the type test information from package.json, most notably any known broken type tests,
-  and generates an appropriate
+  and generates test files that should be committed.
+
+  To learn more about how to configure type tests, see the detailed documentation at
+  <https://github.com/microsoft/FluidFramework/blob/main/build-tools/packages/build-cli/docs/typetestDetails.md>.
 
 EXAMPLES
   Prepare the package.json for all packages in the client release group.
diff --git a/build-tools/packages/build-cli/docs/typetestDetails.md b/build-tools/packages/build-cli/docs/typetestDetails.md
new file mode 100644
index 000000000000..4b3e1530a3e7
--- /dev/null
+++ b/build-tools/packages/build-cli/docs/typetestDetails.md
@@ -0,0 +1,90 @@
+# Further information about `generate typetests`
+
+The `generate typetests` command generates type compatibility tests based on the individual package settings in
+package.json.
+
+## What are type compatibility tests?
+
+Type compatibility tests are automatically generated test cases that check for type incompatibilities across package
+versions. They work by comparing types in the current version to the types in a previous version. The generated tests
+use the previous type in place of the new type, and vice-versa.
+
+See the [API Type Validation][] page in the Fluid Framework wiki for more information about type compatibility tests,
+including how to annotate expected type incompatibilities to fix failing tests.
+
+## Configuring type tests
+
+Type test generation is primarily configured in the package.json file of the package being tested, in the
+`typeValidation` section:
+
+```json
+"typeValidation": {
+  "disabled": false,
+  "version": "1.1.0",
+  "broken": {
+    "InterfaceDeclaration_AzureClientProps": {
+      "forwardCompat": false
+    }
+  }
+}
+```
+
+The `broken` section is used to indicate known breaking changes. Type tests can be completely disabled for a package
+using the `disabled1 property. See [API Type Validation][] for more information.
+
+Generating type tests has two parts: _preparing package.json_ and _generating test modules_. By default, both steps are
+run for each package. You can run only one part at a time using the `--prepare` and `--generate` flags.
+
+[api type validation]: https://github.com/microsoft/FluidFramework/wiki/API-Type-Validation
+
+## Preparing package.json
+
+_Preparing package.json_ determines the baseline previous version to use, then sets that version in package.json. If the
+previous version changes after running preparation, then `npm install` must be run before the generate step will run
+correctly.
+
+Optionally, any type tests that are marked "broken" in package.json can be reset using the `--reset` flag during
+preparation. This is useful when resetting the type tests to a clean state, such as after a major release.
+
+## Generating tests
+
+Generating test modules takes the type test information from package.json, most notably any known broken type tests, and
+generates test files that should be committed. By default, the generated files will contain `.generated` in their name,
+but this can be suppressed with the `--no-generateInName` flag.
+
+For more detailed usage information see the
+[bump deps command reference](bump.md#flub-bump-deps-packageorreleasegroup).
+
+## Branch configuration
+
+Type tests can be configured to use different baseline versions on a given branch depending on the type of release that
+the branch is designated for. For example, for the client release group, the _next_ branch is the _major version series
+branch_ and _main_ is the _minor version series branch_. This can be declared in the root package.json, in the
+`fluidBuild.repoPackages` section. For example, the following configuration designates the _main_ and _lts_ branches as
+minor version series branches, while the _next_ branch is designated for major releases.
+
+```json
+"fluidBuild": {
+  "repoPackages": {
+    "client": {
+      "directory": "",
+      "ignoredDirs": [],
+      "branchReleaseTypes": {
+        "main": "minor",
+        "lts": "minor",
+        "release/*": "patch",
+        "next": "major"
+      }
+    }
+  }
+}
+```
+
+The type test generator takes this information into account when calculating the baseline version to use when it's run
+from a particular branch. Baseline versions are set as follows based on the branch release designation:
+
+| Branch release designation | Baseline version | Example: version 2.3.4               |
+| -------------------------- | ---------------- | ------------------------------------ |
+| patch                      | `previousPatch`  | 2.3.4 baseline version is **2.3.3**  |
+| minor                      | `^previousMinor` | 2.3.4 baseline version is **^2.2.0** |
+| major                      | `^previousMajor` | 2.3.4 baseline version is **^1.0.0** |
diff --git a/build-tools/packages/build-cli/src/commands/generate/typetests.ts b/build-tools/packages/build-cli/src/commands/generate/typetests.ts
index cda261e7d927..1a7a3f6e4691 100644
--- a/build-tools/packages/build-cli/src/commands/generate/typetests.ts
+++ b/build-tools/packages/build-cli/src/commands/generate/typetests.ts
@@ -17,16 +17,17 @@ import { releaseGroupFlag } from "../../flags";
 export default class GenerateTypeTestsCommand extends BaseCommand<
     typeof GenerateTypeTestsCommand.flags
 > {
-    static summary =
-        "Generates type tests based on the individual package settings in package.json.";
+    static description = `Generates type tests based on the individual package settings in package.json.
 
-    static description = `Generating type tests has two parts: preparing package.json and generating test modules. By default, both steps are run for each package. You can run only one part at a time using the --prepare and --generate flags.
+    Generating type tests has two parts: preparing package.json and generating test modules. By default, both steps are run for each package. You can run only one part at a time using the --prepare and --generate flags.
 
     Preparing package.json determines the baseline previous version to use, then sets that version in package.json. If the previous version changes after running preparation, then npm install must be run before the generate step will run correctly.
 
     Optionally, any type tests that are marked "broken" in package.json can be reset using the --reset flag during preparation. This is useful when resetting the type tests to a clean state, such as after a major release.
 
-    Generating test modules takes the type test information from package.json, most notably any known broken type tests, and generates an appropriate `;
+    Generating test modules takes the type test information from package.json, most notably any known broken type tests, and generates test files that should be committed.
+
+    To learn more about how to configure type tests, see the detailed documentation at <https://github.com/microsoft/FluidFramework/blob/main/build-tools/packages/build-cli/docs/typetestDetails.md>.`;
 
     static flags = {
         dir: Flags.directory({
diff --git a/build-tools/packages/version-tools/README.md b/build-tools/packages/version-tools/README.md
index 772ddc1a605f..e2470aa3794a 100644
--- a/build-tools/packages/version-tools/README.md
+++ b/build-tools/packages/version-tools/README.md
@@ -117,7 +117,7 @@ EXAMPLES
   $ fluv autocomplete --refresh-cache
 ```
 
-_See code: [@oclif/plugin-autocomplete](https://github.com/oclif/plugin-autocomplete/blob/v1.3.6/src/commands/autocomplete/index.ts)_
+_See code: [@oclif/plugin-autocomplete](https://github.com/oclif/plugin-autocomplete/blob/v1.3.5/src/commands/autocomplete/index.ts)_
 
 ## `fluv help [COMMAND]`
 
@@ -137,7 +137,7 @@ DESCRIPTION
   Display help for fluv.
 ```
 
-_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v5.1.14/src/commands/help.ts)_
+_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v5.1.12/src/commands/help.ts)_
 
 ## `fluv version VERSION`
 

From e38061a1ceba40059144f69dfdb16ce45038bebc Mon Sep 17 00:00:00 2001
From: Tyler Butler <tyler@tylerbutler.com>
Date: Fri, 11 Nov 2022 15:07:44 -0800
Subject: [PATCH 08/22] updates

---
 .../build-cli/docs/typetestDetails.md         | 80 +++++++++++++++++--
 .../build-tools/src/common/fluidRepo.ts       |  3 +-
 .../src/typeValidator/packageJson.ts          | 57 ++++++++-----
 package.json                                  |  4 +-
 4 files changed, 114 insertions(+), 30 deletions(-)

diff --git a/build-tools/packages/build-cli/docs/typetestDetails.md b/build-tools/packages/build-cli/docs/typetestDetails.md
index 4b3e1530a3e7..58f60100947e 100644
--- a/build-tools/packages/build-cli/docs/typetestDetails.md
+++ b/build-tools/packages/build-cli/docs/typetestDetails.md
@@ -72,7 +72,7 @@ minor version series branches, while the _next_ branch is designated for major r
       "branchReleaseTypes": {
         "main": "minor",
         "lts": "minor",
-        "release/*": "patch",
+        "release/**": "patch",
         "next": "major"
       }
     }
@@ -80,11 +80,75 @@ minor version series branches, while the _next_ branch is designated for major r
 }
 ```
 
-The type test generator takes this information into account when calculating the baseline version to use when it's run
-from a particular branch. Baseline versions are set as follows based on the branch release designation:
+The branch names can be globs. They are matched using [minimatch](https://www.npmjs.com/package/minimatch).
 
-| Branch release designation | Baseline version | Example: version 2.3.4               |
-| -------------------------- | ---------------- | ------------------------------------ |
-| patch                      | `previousPatch`  | 2.3.4 baseline version is **2.3.3**  |
-| minor                      | `^previousMinor` | 2.3.4 baseline version is **^2.2.0** |
-| major                      | `^previousMajor` | 2.3.4 baseline version is **^1.0.0** |
+The type test generator takes this information into account when calculating the baseline version to use when it's run
+on a particular branch. Baseline versions are set as follows based on the branch release designation:
+
+| Branch release designation | Baseline version | Example: version 2.3.4 |
+| -------------------------- | ---------------- | ---------------------- |
+| `patch`                    | `previousPatch`  | **2.3.3**              |
+| `minor`                    | `^previousMinor` | **^2.2.0**             |
+| `major`                    | `^previousMajor` | **^1.0.0**             |
+
+### Configuring a branch for a specific baseline
+
+It may be useful to configure a branch for a specific baseline instead of the default based on the branch release
+designation. To do this, you can use any of the following strings instead of major/minor/patch.
+
+- `baseMajor`
+- `baseMinor`
+- `~baseMinor`
+- `previousPatch`
+- `previousMinor`
+- `previousMajor`
+- `^previousMajor`
+- `^previousMinor`
+- `~previousMajor`
+- `~previousMinor`
+
+Given the version 3.4.5:
+
+| Previous version style | Baseline version for **3.4.5** |
+| ---------------------- | ------------------------------ |
+| `baseMajor`            | 3.0.0                          |
+| `baseMinor`            | 3.4.0                          |
+| `~baseMinor`           | ~3.4.0                         |
+| `previousPatch`        | 3.4.4                          |
+| `previousMajor`        | 2.0.0                          |
+| `previousMinor`        | 3.3.0                          |
+| `^previousMajor`       | ^2.0.0                         |
+| `^previousMinor`       | ^3.3.0                         |
+| `~previousMajor`       | ~2.0.0                         |
+| `~previousMinor`       | ~3.3.0                         |
+
+
+Given the version 2.0.0-internal.2.3.5:
+
+| Previous version style | Baseline version for **2.0.0-internal.2.3.5** |
+| ---------------------- | --------------------------------------------- |
+| `baseMajor`            | 2.0.0-internal.2.0.0                          |
+| `baseMinor`            | 2.0.0-internal.2.3.0                          |
+| `~baseMinor`           | >=2.0.0-internal.2.3.0 <2.0.0-internal.3.0.0  |
+| `previousPatch`        | 2.0.0-internal.2.3.4                          |
+| `previousMajor`        | 2.0.0-internal.1.0.0                          |
+| `previousMinor`        | 2.0.0-internal.2.2.0                          |
+| `^previousMajor`       | >=2.0.0-internal.1.0.0 <2.0.0-internal.2.0.0  |
+| `^previousMinor`       | >=2.0.0-internal.2.2.0 <2.0.0-internal.3.0.0  |
+| `~previousMajor`       | >=2.0.0-internal.1.0.0 <2.0.0-internal.1.1.0  |
+| `~previousMinor`       | >=2.0.0-internal.2.2.0 <2.0.0-internal.2.2.0  |
+
+Given the version 2.0.0-internal.2.0.0:
+
+| Previous version style | Baseline version for **2.0.0-internal.2.0.0** |
+| ---------------------- | --------------------------------------------- |
+| `baseMajor`            | 2.0.0-internal.2.0.0                          |
+| `baseMinor`            | 2.0.0-internal.2.0.0                          |
+| `~baseMinor`           | >=2.0.0-internal.2.0.0 <2.0.0-internal.2.1.0  |
+| `previousPatch`        | 2.0.0-internal.2.0.0                          |
+| `previousMajor`        | 2.0.0-internal.1.0.0                          |
+| `previousMinor`        | 2.0.0-internal.2.0.0                          |
+| `^previousMajor`       | >=2.0.0-internal.1.0.0 <2.0.0-internal.2.0.0  |
+| `^previousMinor`       | >=2.0.0-internal.2.0.0 <2.0.0-internal.3.0.0  |
+| `~previousMajor`       | >=2.0.0-internal.1.0.0 <2.0.0-internal.1.1.0  |
+| `~previousMinor`       | >=2.0.0-internal.2.0.0 <2.0.0-internal.2.1.0  |
diff --git a/build-tools/packages/build-tools/src/common/fluidRepo.ts b/build-tools/packages/build-tools/src/common/fluidRepo.ts
index 5dbd05cf10de..f7f762baae5a 100644
--- a/build-tools/packages/build-tools/src/common/fluidRepo.ts
+++ b/build-tools/packages/build-tools/src/common/fluidRepo.ts
@@ -6,6 +6,7 @@ import * as path from "path";
 
 import { VersionBumpType } from "@fluid-tools/version-tools";
 
+import { PreviousVersionStyle } from "../typeValidator/packageJson";
 import { getPackageManifest } from "./fluidUtils";
 import { Logger, defaultLogger } from "./logging";
 import { MonoRepo, MonoRepoKind, isMonoRepoKind } from "./monoRepo";
@@ -36,7 +37,7 @@ export interface IFluidRepoPackage {
     directory: string;
     ignoredDirs?: string[];
     branchReleaseTypes?: {
-        [name: string]: VersionBumpType;
+        [name: string]: VersionBumpType | PreviousVersionStyle;
     };
 }
 
diff --git a/build-tools/packages/build-tools/src/typeValidator/packageJson.ts b/build-tools/packages/build-tools/src/typeValidator/packageJson.ts
index 0f32ad60ecc8..5ea574cf4603 100644
--- a/build-tools/packages/build-tools/src/typeValidator/packageJson.ts
+++ b/build-tools/packages/build-tools/src/typeValidator/packageJson.ts
@@ -4,6 +4,7 @@
  */
 import child_process from "child_process";
 import * as fs from "fs";
+import minimatch from "minimatch";
 import * as semver from "semver";
 import * as util from "util";
 
@@ -14,6 +15,7 @@ import {
     getPreviousVersions,
     getVersionRange,
     isInternalVersionScheme,
+    isVersionBumpType,
     toInternalScheme,
 } from "@fluid-tools/version-tools";
 
@@ -322,6 +324,19 @@ export async function getAndUpdatePackageDetails(
     const pkg = context.fullPackageMap.get(packageDetails.pkg.name);
     if (pkg === undefined) {
         return { skipReason: "Skipping package: not found in context" };
+    } else if (packageDetails.pkg.name.startsWith("@fluid-internal")) {
+        // @fluid-internal packages are intended for internal use only and are not typically published. We don't make
+        // compatibility promises for them, so they're excluded from type tests.
+        return { skipReason: "Skipping package: @fluid-internal" };
+    } else if (packageDetails.pkg.main?.endsWith("index.js") !== true) {
+        // An index.js main entrypoint is required for type tests to be enabled.
+        return { skipReason: "Skipping package: no index.js in main property" };
+    } else if (packageDetails.pkg.private === true) {
+        // Private packages aren't published, so no need to do type testing for them.
+        return { skipReason: "Skipping package: private package" };
+    } else if (packageDetails.pkg.typeValidation?.disabled === true) {
+        // Packages can explicitly opt out of type tests by setting typeValidation.disabled to true.
+        return { skipReason: "Skipping package: type validation disabled" };
     }
 
     const releaseGroup = pkg.monoRepo?.kind;
@@ -329,15 +344,32 @@ export async function getAndUpdatePackageDetails(
         return { skipReason: `Package has no release group: ${pkg.name}` };
     }
 
-    const config = context.packageManifest.repoPackages[pkg.monoRepo.kind];
+    const releaseGroupConfig = context.packageManifest.repoPackages[pkg.monoRepo.kind];
     let releaseType: VersionBumpType | undefined;
+    let previousVersionStyle: PreviousVersionStyle | undefined;
+
+    if (typeof releaseGroupConfig === "object") {
+        const rpg = releaseGroupConfig as IFluidRepoPackage;
+        const releaseTypes = rpg.branchReleaseTypes;
+        if (releaseTypes === undefined) {
+            return { skipReason: `Package has no branchReleaseTypes defined: ${pkg.name}` };
+        }
 
-    if (typeof config === "object") {
-        const rpg = config as IFluidRepoPackage;
-        releaseType = rpg.branchReleaseTypes?.[context.originalBranchName];
+        for (const [branchPattern, branchReleaseType] of Object.entries(releaseTypes)) {
+            if (minimatch(context.originalBranchName, branchPattern)) {
+                // The config can be either a VersionBumpType (major/minor/patch) which will be used to calculate the
+                // previous version or a PreviousVersionStyle that will used as-is.
+                if (isVersionBumpType(branchReleaseType)) {
+                    releaseType = branchReleaseType;
+                } else {
+                    previousVersionStyle = branchReleaseType;
+                }
+            }
+        }
     }
 
-    const previousVersionStyle: PreviousVersionStyle | undefined =
+    previousVersionStyle =
+        previousVersionStyle ??
         style ??
         (releaseType === "major"
             ? "^previousMajor"
@@ -347,20 +379,7 @@ export async function getAndUpdatePackageDetails(
             ? "previousPatch"
             : undefined);
 
-    if (packageDetails.pkg.name.startsWith("@fluid-internal")) {
-        // @fluid-internal packages are intended for internal use only and are not typically published. We don't make
-        // compatibility promises for them, so they're excluded from type tests.
-        return { skipReason: "Skipping package: @fluid-internal" };
-    } else if (packageDetails.pkg.main?.endsWith("index.js") !== true) {
-        // An index.js main entrypoint is required for type tests to be enabled.
-        return { skipReason: "Skipping package: no index.js in main property" };
-    } else if (packageDetails.pkg.private === true) {
-        // Private packages aren't published, so no need to do type testing for them.
-        return { skipReason: "Skipping package: private package" };
-    } else if (packageDetails.pkg.typeValidation?.disabled === true) {
-        // Packages can explicitly opt out of type tests by setting typeValidation.disabled to true.
-        return { skipReason: "Skipping package: type validation disabled" };
-    } else if (previousVersionStyle === undefined) {
+    if (previousVersionStyle === undefined) {
         // Skip if there's no previous version style defined for the package.
         return { skipReason: "Skipping package: previousVersionStyle is undefined" };
     }
diff --git a/package.json b/package.json
index 3de6fa028b66..7b8012024331 100644
--- a/package.json
+++ b/package.json
@@ -143,7 +143,7 @@
         "branchReleaseTypes": {
           "main": "major",
           "lts": "minor",
-          "release/*": "patch"
+          "release/azure/*": "patch"
         }
       },
       "build-tools": "build-tools",
@@ -154,7 +154,7 @@
         "branchReleaseTypes": {
           "main": "minor",
           "lts": "minor",
-          "release/*": "patch",
+          "release/**": "patch",
           "next": "major"
         }
       },

From 2c0b0424434f65ac51d39fb5621ded21f7fc74d3 Mon Sep 17 00:00:00 2001
From: Tyler Butler <tyler@tylerbutler.com>
Date: Fri, 11 Nov 2022 15:25:53 -0800
Subject: [PATCH 09/22] Update
 build-tools/packages/build-cli/docs/typetestDetails.md

---
 build-tools/packages/build-cli/docs/typetestDetails.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-tools/packages/build-cli/docs/typetestDetails.md b/build-tools/packages/build-cli/docs/typetestDetails.md
index 58f60100947e..ccdef8601eb0 100644
--- a/build-tools/packages/build-cli/docs/typetestDetails.md
+++ b/build-tools/packages/build-cli/docs/typetestDetails.md
@@ -30,7 +30,7 @@ Type test generation is primarily configured in the package.json file of the pac
 ```
 
 The `broken` section is used to indicate known breaking changes. Type tests can be completely disabled for a package
-using the `disabled1 property. See [API Type Validation][] for more information.
+using the `disabled` property. See [API Type Validation][] for more information.
 
 Generating type tests has two parts: _preparing package.json_ and _generating test modules_. By default, both steps are
 run for each package. You can run only one part at a time using the `--prepare` and `--generate` flags.

From 3561aaa99297eaf74a4dc5b69d6722acbde6560c Mon Sep 17 00:00:00 2001
From: Tyler Butler <tyler@tylerbutler.com>
Date: Fri, 11 Nov 2022 15:25:59 -0800
Subject: [PATCH 10/22] Update
 build-tools/packages/build-cli/docs/typetestDetails.md

---
 build-tools/packages/build-cli/docs/typetestDetails.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/build-tools/packages/build-cli/docs/typetestDetails.md b/build-tools/packages/build-cli/docs/typetestDetails.md
index ccdef8601eb0..736d3fa9fafa 100644
--- a/build-tools/packages/build-cli/docs/typetestDetails.md
+++ b/build-tools/packages/build-cli/docs/typetestDetails.md
@@ -52,9 +52,6 @@ Generating test modules takes the type test information from package.json, most
 generates test files that should be committed. By default, the generated files will contain `.generated` in their name,
 but this can be suppressed with the `--no-generateInName` flag.
 
-For more detailed usage information see the
-[bump deps command reference](bump.md#flub-bump-deps-packageorreleasegroup).
-
 ## Branch configuration
 
 Type tests can be configured to use different baseline versions on a given branch depending on the type of release that

From bb70fb0beba7b140b8c2ac1f16471fa441143fad Mon Sep 17 00:00:00 2001
From: Tyler Butler <tyler@tylerbutler.com>
Date: Fri, 11 Nov 2022 15:43:42 -0800
Subject: [PATCH 11/22] Update build-tools/packages/build-cli/.eslintrc.cjs

---
 build-tools/packages/build-cli/.eslintrc.cjs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/build-tools/packages/build-cli/.eslintrc.cjs b/build-tools/packages/build-cli/.eslintrc.cjs
index 8773ed167708..8ca637a90c79 100644
--- a/build-tools/packages/build-cli/.eslintrc.cjs
+++ b/build-tools/packages/build-cli/.eslintrc.cjs
@@ -26,9 +26,6 @@ module.exports = {
             {
                 allow: [
                     "@oclif/core/lib/interfaces",
-                    "@oclif/core/lib/util",
-                    "oclif/lib/commands/**",
-                    "oclif/lib/util",
                     "npm-check-updates/build/src/types/**",
                     "**/commands/**",
                 ],

From 5f6756bd6bad36c5fe9a181c64761cda6d5210fb Mon Sep 17 00:00:00 2001
From: Tyler Butler <tyler@tylerbutler.com>
Date: Mon, 14 Nov 2022 18:01:59 -0800
Subject: [PATCH 12/22] Apply suggestions from code review

---
 build-tools/packages/build-cli/docs/typetestDetails.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/build-tools/packages/build-cli/docs/typetestDetails.md b/build-tools/packages/build-cli/docs/typetestDetails.md
index 736d3fa9fafa..360841ec8ab6 100644
--- a/build-tools/packages/build-cli/docs/typetestDetails.md
+++ b/build-tools/packages/build-cli/docs/typetestDetails.md
@@ -104,6 +104,8 @@ designation. To do this, you can use any of the following strings instead of maj
 - `~previousMajor`
 - `~previousMinor`
 
+#### Examples
+
 Given the version 3.4.5:
 
 | Previous version style | Baseline version for **3.4.5** |

From eb72d80c8a290a0ab33d02fc0425f8761e413c9e Mon Sep 17 00:00:00 2001
From: Tyler Butler <tyler@tylerbutler.com>
Date: Mon, 14 Nov 2022 18:29:49 -0800
Subject: [PATCH 13/22] feedback

---
 .../build-cli/src/commands/generate/typetests.ts    |  2 +-
 .../packages/build-tools/src/bumpVersion/context.ts |  2 +-
 .../packages/build-tools/src/common/fluidRepo.ts    | 13 +++++++++++++
 .../build-tools/src/typeValidator/packageJson.ts    | 12 +++++++++---
 4 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/build-tools/packages/build-cli/src/commands/generate/typetests.ts b/build-tools/packages/build-cli/src/commands/generate/typetests.ts
index 1a7a3f6e4691..492cae5ed1b7 100644
--- a/build-tools/packages/build-cli/src/commands/generate/typetests.ts
+++ b/build-tools/packages/build-cli/src/commands/generate/typetests.ts
@@ -56,7 +56,7 @@ export default class GenerateTypeTestsCommand extends BaseCommand<
         versionConstraint: Flags.string({
             char: "s",
             description:
-                "The type of version constraint to use for previous versions. Only applies to the prepare phase.",
+                "The type of version constraint to use for previous versions. Only applies to the prepare phase. This overrides the branch-specific configuration in package.json.",
             options: [
                 "^previousMajor",
                 "^previousMinor",
diff --git a/build-tools/packages/build-tools/src/bumpVersion/context.ts b/build-tools/packages/build-tools/src/bumpVersion/context.ts
index 377754374f9c..39507db13f81 100644
--- a/build-tools/packages/build-tools/src/bumpVersion/context.ts
+++ b/build-tools/packages/build-tools/src/bumpVersion/context.ts
@@ -21,9 +21,9 @@ import { ReferenceVersionBag, VersionBag } from "./versionBag";
 export class Context {
     public readonly repo: FluidRepo;
     public readonly fullPackageMap: Map<string, Package>;
+    public readonly packageManifest: IPackageManifest;
 
     private readonly timer: Timer;
-    public readonly packageManifest: IPackageManifest;
     private readonly newBranches: string[] = [];
     private readonly newTags: string[] = [];
 
diff --git a/build-tools/packages/build-tools/src/common/fluidRepo.ts b/build-tools/packages/build-tools/src/common/fluidRepo.ts
index f7f762baae5a..a28f53fb9162 100644
--- a/build-tools/packages/build-tools/src/common/fluidRepo.ts
+++ b/build-tools/packages/build-tools/src/common/fluidRepo.ts
@@ -34,8 +34,21 @@ export interface PolicyConfig {
 }
 
 export interface IFluidRepoPackage {
+    /**
+     * The path to the package.
+     */
     directory: string;
+
+    /**
+     * An array of paths under `directory` that should be ignored.
+     */
     ignoredDirs?: string[];
+
+    /**
+     * A mapping of branch names to previous version baseline styles. The type test generator takes this information
+     * into account when calculating the baseline version to use when it's run on a particular branch. If this is not
+     * defined for a branch or package, then that package will be skipped during type test generation.
+     */
     branchReleaseTypes?: {
         [name: string]: VersionBumpType | PreviousVersionStyle;
     };
diff --git a/build-tools/packages/build-tools/src/typeValidator/packageJson.ts b/build-tools/packages/build-tools/src/typeValidator/packageJson.ts
index 5ea574cf4603..0a580be5575c 100644
--- a/build-tools/packages/build-tools/src/typeValidator/packageJson.ts
+++ b/build-tools/packages/build-tools/src/typeValidator/packageJson.ts
@@ -289,6 +289,10 @@ function getPreviousVersionBaseline(version: ReleaseVersion, style: PreviousVers
                 : `~${previousMinorVersion}`;
             break;
         }
+
+        default: {
+            throw new Error(`Unexpected previousVersionStyle: ${style}`);
+        }
     }
 
     return prevVersion;
@@ -301,10 +305,12 @@ function getPreviousVersionBaseline(version: ReleaseVersion, style: PreviousVers
  * The version used for the previous version can be adjusted by passing different "style" values in via the
  * previousVersionStyle parameter.
  *
+ * @param context - The repo {@link Context}.
  * @param packageDir - The path to the package.
  * @param writeUpdates - If true, will update the package.json with new previous versions.
- * @param previousVersionStyle - The version style to use when determining the previous version. Can be the exact
- * previous major or minor versions, or caret/tilde-equivalent dependency ranges on those previous versions.
+ * @param style - The version style to use when determining the previous version. Can be the exact
+ * previous major or minor versions, or caret/tilde-equivalent dependency ranges on those previous versions. If this
+ * is undefined, then the style will be set according to the branchReleaseTypes defined in package.json.
  * @param exactPreviousVersionString - If provided, this string will be used as the previous version string.
  * @param resetBroken - If true, clears the "broken" section of the type validation, effectively clearing all known
  * breaking changes.
@@ -323,7 +329,7 @@ export async function getAndUpdatePackageDetails(
     const packageDetails = await getPackageDetails(packageDir);
     const pkg = context.fullPackageMap.get(packageDetails.pkg.name);
     if (pkg === undefined) {
-        return { skipReason: "Skipping package: not found in context" };
+        return { skipReason: "Skipping package: not found in repo" };
     } else if (packageDetails.pkg.name.startsWith("@fluid-internal")) {
         // @fluid-internal packages are intended for internal use only and are not typically published. We don't make
         // compatibility promises for them, so they're excluded from type tests.

From 8041644ce9ba8d55c4ce6a0c0303c20dad4b759a Mon Sep 17 00:00:00 2001
From: Tyler Butler <tyler@tylerbutler.com>
Date: Mon, 14 Nov 2022 18:32:25 -0800
Subject: [PATCH 14/22] full build

---
 build-tools/packages/build-cli/docs/generate.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-tools/packages/build-cli/docs/generate.md b/build-tools/packages/build-cli/docs/generate.md
index 5cdb484c851b..7d70ba3d8137 100644
--- a/build-tools/packages/build-cli/docs/generate.md
+++ b/build-tools/packages/build-cli/docs/generate.md
@@ -122,7 +122,7 @@ FLAGS
   -g, --releaseGroup=<option>       Run on all packages within this release group.
                                     <options: client|server|azure|build-tools>
   -s, --versionConstraint=<option>  The type of version constraint to use for previous versions. Only applies to the
-                                    prepare phase.
+                                    prepare phase. This overrides the branch-specific configuration in package.json.
                                     <options: ^previousMajor|^previousMinor|~previousMajor|~previousMinor|previousMajor|
                                     previousMinor|previousPatch|baseMinor|baseMajor|~baseMinor>
   -v, --verbose                     Verbose logging.

From 361c9e5811aa04b350499346894c63d3f15309bb Mon Sep 17 00:00:00 2001
From: Tyler Butler <tyler@tylerbutler.com>
Date: Mon, 14 Nov 2022 18:34:10 -0800
Subject: [PATCH 15/22] cleanup

---
 .../packages/build-tools/src/typeValidator/packageJson.ts      | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/build-tools/packages/build-tools/src/typeValidator/packageJson.ts b/build-tools/packages/build-tools/src/typeValidator/packageJson.ts
index 0a580be5575c..3f6a483ee944 100644
--- a/build-tools/packages/build-tools/src/typeValidator/packageJson.ts
+++ b/build-tools/packages/build-tools/src/typeValidator/packageJson.ts
@@ -21,9 +21,6 @@ import {
 
 import { Context } from "../bumpVersion/context";
 import { IFluidRepoPackage } from "../common/fluidRepo";
-import { getPackageManifest } from "../common/fluidUtils";
-import { MonoRepoKind } from "../common/monoRepo";
-import { Package } from "../common/npmPackage";
 
 export type PackageDetails = {
     readonly packageDir: string;

From 7025b2b56623ca69588a977afdc45d2ed7b4a37f Mon Sep 17 00:00:00 2001
From: Tyler Butler <tyler@tylerbutler.com>
Date: Tue, 15 Nov 2022 18:30:12 -0800
Subject: [PATCH 16/22] feedback

---
 azure/package.json                            |   7 +
 .../packages/build-cli/docs/generate.md       |  62 ++++--
 .../build-cli/docs/typetestDetails.md         |  31 +--
 .../src/commands/generate/typetests.ts        |  28 ++-
 .../build-cli/src/commands/release/report.ts  |   8 +-
 .../packages/build-cli/src/lib/index.ts       |   4 -
 .../packages/build-cli/src/lib/package.ts     | 114 +-----------
 .../build-cli/test/lib/package.test.ts        |   4 +-
 .../build-tools/src/bumpVersion/context.ts    | 101 +++++++++-
 .../build-tools/src/common/fluidRepo.ts       |  72 +++++--
 .../build-tools/src/common/fluidUtils.ts      |  12 +-
 .../build-tools/src/common/monoRepo.ts        |  32 ++--
 .../build-tools/src/common/npmPackage.ts      |  69 ++++++-
 .../packages/build-tools/src/common/tags.ts   |  29 +++
 build-tools/packages/build-tools/src/index.ts |   2 +-
 .../src/repoPolicyCheck/handlers/lockfiles.ts |  10 +-
 .../repoPolicyCheck/handlers/npmPackages.ts   |  12 +-
 .../src/typeValidator/packageJson.ts          | 176 ++++++++++--------
 .../src/typeValidator/repoValidator.ts        |   8 +-
 .../packages/version-tools/src/semver.ts      |   4 +-
 .../version-tools/src/test/semver.test.ts     |  10 +-
 common/lib/common-definitions/package.json    |   6 +
 common/lib/common-utils/package.json          |   6 +
 common/lib/protocol-definitions/package.json  |   6 +
 package.json                                  |  23 +--
 25 files changed, 538 insertions(+), 298 deletions(-)
 create mode 100644 build-tools/packages/build-tools/src/common/tags.ts

diff --git a/azure/package.json b/azure/package.json
index 6bec72b6f88f..b33f2115d024 100644
--- a/azure/package.json
+++ b/azure/package.json
@@ -97,5 +97,12 @@
     "rimraf": "^2.6.2",
     "run-script-os": "^1.1.6",
     "typescript": "~4.5.5"
+  },
+  "fluidBuild": {
+    "branchReleaseTypes": {
+      "main": "major",
+      "lts": "minor",
+      "release/azure/*": "patch"
+    }
   }
 }
diff --git a/build-tools/packages/build-cli/docs/generate.md b/build-tools/packages/build-cli/docs/generate.md
index 7d70ba3d8137..56ae872c3ea6 100644
--- a/build-tools/packages/build-cli/docs/generate.md
+++ b/build-tools/packages/build-cli/docs/generate.md
@@ -114,27 +114,51 @@ Generates type tests based on the individual package settings in package.json.
 ```
 USAGE
   $ flub generate typetests [-d <value> | --packages | -g client|server|azure|build-tools] [--prepare | --generate]
-    [--exact <value> |  | -s ^previousMajor|^previousMinor|~previousMajor|~previousMinor|previousMajor|previousMinor|pre
-    viousPatch|baseMinor|baseMajor|~baseMinor] [--reset | ] [--generateInName] [-v]
+    [--pin] [--exact <value> |  | -s ^previousMajor|^previousMinor|~previousMajor|~previousMinor|previousMajor|previousM
+    inor|previousPatch|baseMinor|baseMajor|~baseMinor] [--reset | ] [--generateInName] [-v]
 
 FLAGS
-  -d, --dir=<value>                 Run on the package in this directory.
-  -g, --releaseGroup=<option>       Run on all packages within this release group.
-                                    <options: client|server|azure|build-tools>
-  -s, --versionConstraint=<option>  The type of version constraint to use for previous versions. Only applies to the
-                                    prepare phase. This overrides the branch-specific configuration in package.json.
-                                    <options: ^previousMajor|^previousMinor|~previousMajor|~previousMinor|previousMajor|
-                                    previousMinor|previousPatch|baseMinor|baseMajor|~baseMinor>
-  -v, --verbose                     Verbose logging.
-  --exact=<value>                   An exact string to use as the previous version constraint. The string will be used
-                                    as-is. Only applies to the prepare phase.
-  --generate                        Generates tests only. Doesn't prepare the package.json.
-  --[no-]generateInName             Includes .generated in the generated type test filenames.
-  --packages                        Run on all independent packages in the repo.
-  --prepare                         Prepares the package.json only. Doesn't generate tests. Note that npm install may
-                                    need to be run after preparation.
-  --reset                           Resets the broken type test settings in package.json. Only applies to the prepare
-                                    phase.
+  -d, --dir=<value>
+      Run on the package in this directory.
+
+  -g, --releaseGroup=<option>
+      Run on all packages within this release group.
+      <options: client|server|azure|build-tools>
+
+  -s, --versionConstraint=<option>
+      The type of version constraint to use for previous versions. Only applies to the prepare phase. This overrides the
+      branch-specific configuration in package.json, which is used by default.
+
+      For more information about the options, see <https://github.com/microsoft/FluidFramework/blob/main/build-tools/packa
+      ges/build-cli/docs/typetestDetails.md#configuring-a-branch-for-a-specific-baseline>
+      <options: ^previousMajor|^previousMinor|~previousMajor|~previousMinor|previousMajor|previousMinor|previousPatch|base
+      Minor|baseMajor|~baseMinor>
+
+  -v, --verbose
+      Verbose logging.
+
+  --exact=<value>
+      An exact string to use as the previous version constraint. The string will be used as-is. Only applies to the
+      prepare phase.
+
+  --generate
+      Generates tests only. Doesn't prepare the package.json.
+
+  --[no-]generateInName
+      Includes .generated in the generated type test filenames.
+
+  --packages
+      Run on all independent packages in the repo. This is an alternative to using the --dir flag for independent
+      packages.
+
+  --pin
+      Searches the release git tags in the repo and pins the baseline version range to the maximum matching release.
+
+  --prepare
+      Prepares the package.json only. Doesn't generate tests. Note that npm install may need to be run after preparation.
+
+  --reset
+      Resets the broken type test settings in package.json. Only applies to the prepare phase.
 
 DESCRIPTION
   Generates type tests based on the individual package settings in package.json.
diff --git a/build-tools/packages/build-cli/docs/typetestDetails.md b/build-tools/packages/build-cli/docs/typetestDetails.md
index 360841ec8ab6..11e5225a9205 100644
--- a/build-tools/packages/build-cli/docs/typetestDetails.md
+++ b/build-tools/packages/build-cli/docs/typetestDetails.md
@@ -93,16 +93,26 @@ on a particular branch. Baseline versions are set as follows based on the branch
 It may be useful to configure a branch for a specific baseline instead of the default based on the branch release
 designation. To do this, you can use any of the following strings instead of major/minor/patch.
 
-- `baseMajor`
-- `baseMinor`
-- `~baseMinor`
-- `previousPatch`
-- `previousMinor`
-- `previousMajor`
-- `^previousMajor`
-- `^previousMinor`
-- `~previousMajor`
-- `~previousMinor`
+-   `baseMajor`
+-   `baseMinor`
+-   `~baseMinor`
+-   `previousPatch`
+-   `previousMinor`
+-   `previousMajor`
+-   `^previousMajor`
+-   `^previousMinor`
+-   `~previousMajor`
+-   `~previousMinor`
+
+The "base" versions are calculated by zeroing out all version segments lower than the base. That is, for a version v,
+the baseMajor version is `${v.major}.0.0` and the baseMinor version is `${v.major}.${v.minor}.0`.
+
+The "previous" versions work similarly, but the major/minor/patch segment is reduced by 1. That is, for a version v,
+the previousMajor version is `${min(v.major - 1, 1)}.0.0`, the previousMinor version is
+`${v.major}.${min(v.minor - 1, 0)}.0`, and the previousPatch is `${v.major}.${v.minor}.${min(v.patch - 1, 0)}.0`.
+
+The "previous" versions never roll back below 1 for the major version and 0 for minor and patch. That is, the
+previousMajor, previousMinor, and previousPatch versions for `1.0.0` are all `1.0.0`.
 
 #### Examples
 
@@ -121,7 +131,6 @@ Given the version 3.4.5:
 | `~previousMajor`       | ~2.0.0                         |
 | `~previousMinor`       | ~3.3.0                         |
 
-
 Given the version 2.0.0-internal.2.3.5:
 
 | Previous version style | Baseline version for **2.0.0-internal.2.3.5** |
diff --git a/build-tools/packages/build-cli/src/commands/generate/typetests.ts b/build-tools/packages/build-cli/src/commands/generate/typetests.ts
index 492cae5ed1b7..5802a9de9904 100644
--- a/build-tools/packages/build-cli/src/commands/generate/typetests.ts
+++ b/build-tools/packages/build-cli/src/commands/generate/typetests.ts
@@ -36,7 +36,8 @@ export default class GenerateTypeTestsCommand extends BaseCommand<
             exclusive: ["packages", "releaseGroup"],
         }),
         packages: Flags.boolean({
-            description: "Run on all independent packages in the repo.",
+            description:
+                "Run on all independent packages in the repo. This is an alternative to using the --dir flag for independent packages.",
             default: false,
             exclusive: ["dir", "releaseGroup"],
         }),
@@ -55,8 +56,9 @@ export default class GenerateTypeTestsCommand extends BaseCommand<
         }),
         versionConstraint: Flags.string({
             char: "s",
-            description:
-                "The type of version constraint to use for previous versions. Only applies to the prepare phase. This overrides the branch-specific configuration in package.json.",
+            description: `The type of version constraint to use for previous versions. Only applies to the prepare phase. This overrides the branch-specific configuration in package.json, which is used by default.
+
+                For more information about the options, see <https://github.com/microsoft/FluidFramework/blob/main/build-tools/packages/build-cli/docs/typetestDetails.md#configuring-a-branch-for-a-specific-baseline>`,
             options: [
                 "^previousMajor",
                 "^previousMinor",
@@ -70,6 +72,11 @@ export default class GenerateTypeTestsCommand extends BaseCommand<
                 "~baseMinor",
             ],
         }),
+        pin: Flags.boolean({
+            description:
+                "Searches the release git tags in the repo and pins the baseline version range to the maximum matching release.",
+            default: false,
+        }),
         exact: Flags.string({
             description:
                 "An exact string to use as the previous version constraint. The string will be used as-is. Only applies to the prepare phase.",
@@ -146,15 +153,21 @@ export default class GenerateTypeTestsCommand extends BaseCommand<
             this.info(`Finding package in directory: ${dir}`);
             packageDirs.push(dir);
         } else {
-            // eslint-disable-next-line @typescript-eslint/no-shadow
-            const context = await this.getContext();
+            const ctx = await this.getContext();
+            if (flags.pin === true) {
+                // preload the release data if we're pinning to a version matching the range. This speeds release
+                // lookups later, which are done async so without the precaching there's a big when all the async tasks
+                // execute.
+                this.info(`Loading release data from git tags`);
+                await ctx.loadReleases();
+            }
             if (independentPackages) {
                 this.info(`Finding independent packages`);
-                packageDirs.push(...context.independentPackages.map((p) => p.directory));
+                packageDirs.push(...ctx.independentPackages.map((p) => p.directory));
             } else if (releaseGroup !== undefined) {
                 this.info(`Finding packages for release group: ${releaseGroup}`);
                 packageDirs.push(
-                    ...context.packagesInReleaseGroup(releaseGroup).map((p) => p.directory),
+                    ...ctx.packagesInReleaseGroup(releaseGroup).map((p) => p.directory),
                 );
             }
         }
@@ -199,6 +212,7 @@ export default class GenerateTypeTestsCommand extends BaseCommand<
                             flags.versionConstraint as PreviousVersionStyle | undefined,
                             flags.exact,
                             flags.reset,
+                            flags.pin,
                         ).finally(() => output.push(`Loaded(${Date.now() - start}ms)`));
 
                         if (packageData.skipReason !== undefined) {
diff --git a/build-tools/packages/build-cli/src/commands/release/report.ts b/build-tools/packages/build-cli/src/commands/release/report.ts
index 150e014ecc51..86e455be18ee 100644
--- a/build-tools/packages/build-cli/src/commands/release/report.ts
+++ b/build-tools/packages/build-cli/src/commands/release/report.ts
@@ -12,7 +12,7 @@ import path from "path";
 import sortJson from "sort-json";
 import { table } from "table";
 
-import { Context } from "@fluidframework/build-tools";
+import { Context, VersionDetails } from "@fluidframework/build-tools";
 
 import {
     ReleaseVersion,
@@ -26,7 +26,7 @@ import {
 
 import { BaseCommand } from "../../base";
 import { packageSelectorFlag, releaseGroupFlag } from "../../flags";
-import { VersionDetails, filterVersionsOlderThan, getAllVersions, sortVersions } from "../../lib";
+import { filterVersionsOlderThan, sortVersions } from "../../lib";
 import { CommandLogger } from "../../logging";
 import { ReleaseGroup, ReleasePackage, isReleaseGroup } from "../../releaseGroups";
 
@@ -248,7 +248,7 @@ export default class ReleaseReportCommand extends BaseCommand<typeof ReleaseRepo
         mode: "interactive" | "date" | "version" = "interactive",
     ): Promise<RawReleaseData | undefined> {
         // const tags = await getTagsForReleaseGroup(context, releaseGroup);
-        const versions = await getAllVersions(context, releaseGroupOrPackage);
+        const versions = await context.getAllVersions(releaseGroupOrPackage);
 
         if (versions === undefined) {
             return undefined;
@@ -333,7 +333,7 @@ export default class ReleaseReportCommand extends BaseCommand<typeof ReleaseRepo
         const vIndex = sortedByVersion.findIndex(
             (v) =>
                 v.version === latestReleasedVersion?.version &&
-                v.date === latestReleasedVersion.date,
+                v.date === latestReleasedVersion?.date,
         );
         const previousReleasedVersion =
             vIndex + 1 <= versionCount
diff --git a/build-tools/packages/build-cli/src/lib/index.ts b/build-tools/packages/build-cli/src/lib/index.ts
index 01459838f5aa..25c4a3870bc4 100644
--- a/build-tools/packages/build-cli/src/lib/index.ts
+++ b/build-tools/packages/build-cli/src/lib/index.ts
@@ -23,17 +23,13 @@ export {
 export { Repository } from "./git";
 export {
     filterVersionsOlderThan,
-    getAllVersions,
     getPreReleaseDependencies,
     generateReleaseGitTagName,
-    getTagsForReleaseGroup,
-    getVersionFromTag,
     isReleased,
     npmCheckUpdates,
     PackageVersionMap,
     PreReleaseDependencies,
     sortVersions,
-    VersionDetails,
 } from "./package";
 export { difference } from "./sets";
 export { getIndent, indentString } from "./text";
diff --git a/build-tools/packages/build-cli/src/lib/package.ts b/build-tools/packages/build-cli/src/lib/package.ts
index ee0ebf70a3b3..7063a1e1c1c3 100644
--- a/build-tools/packages/build-cli/src/lib/package.ts
+++ b/build-tools/packages/build-cli/src/lib/package.ts
@@ -10,7 +10,14 @@ import { VersionSpec } from "npm-check-updates/build/src/types/VersionSpec";
 import path from "path";
 import * as semver from "semver";
 
-import { Context, Logger, MonoRepo, Package, readJsonAsync } from "@fluidframework/build-tools";
+import {
+    Context,
+    Logger,
+    MonoRepo,
+    Package,
+    VersionDetails,
+    readJsonAsync,
+} from "@fluidframework/build-tools";
 
 import { ReleaseVersion, isPrereleaseVersion } from "@fluid-tools/version-tools";
 
@@ -350,108 +357,7 @@ export function generateReleaseGitTagName(
 }
 
 /**
- * Returns an array of all the git tags associated with a release group.
- *
- * @param context - The {@link Context}.
- * @param releaseGroupOrPackage - The release group or independent package to get tags for.
- * @returns An array of all all the tags for the release group or package.
- *
- * @internal
- */
-export async function getTagsForReleaseGroup(
-    context: Context,
-    releaseGroupOrPackage: ReleaseGroup | ReleasePackage,
-): Promise<string[]> {
-    const prefix = isReleaseGroup(releaseGroupOrPackage)
-        ? releaseGroupOrPackage.toLowerCase()
-        : PackageName.getUnscopedName(releaseGroupOrPackage);
-    const tagList = await context.gitRepo.getAllTags(`${prefix}_v*`);
-
-    const allTags = tagList;
-    return allTags;
-}
-
-/**
- * Parses the version from a git tag.
- *
- * @param tag - The tag.
- * @returns - The version string, or undefined if one could not be found.
- *
- * @internal
- */
-export function getVersionFromTag(tag: string): string | undefined {
-    // This is sufficient, but there is a possibility that this will fail if we add a tag that includes "_v" in its
-    // name.
-    const tagSplit = tag.split("_v");
-    if (tagSplit.length !== 2) {
-        return undefined;
-    }
-
-    const ver = semver.parse(tagSplit[1]);
-    if (ver === null) {
-        return undefined;
-    }
-
-    return ver.version;
-}
-
-/**
- * Represents a version and its release date, if applicable.
- *
- * @internal
- */
-export interface VersionDetails {
-    /**
-     * The version of the release.
-     */
-    version: ReleaseVersion;
-
-    /**
-     * The date the version was released, if applicable.
-     */
-    date?: Date;
-}
-
-/**
- * Gets all the versions for a release group or independent package. This function only considers the tags in the repo
- * to determine releases and dates.
- *
- * @param context - The {@link Context}.
- * @param releaseGroupOrPackage - The release group or independent package to get versions for.
- * @returns An array of {@link VersionDetails} containing the version and date for each version.
- *
- * @internal
- */
-export async function getAllVersions(
-    context: Context,
-    releaseGroupOrPackage: ReleaseGroup | ReleasePackage,
-): Promise<VersionDetails[] | undefined> {
-    const versions = new Map<string, Date>();
-    const tags = await getTagsForReleaseGroup(context, releaseGroupOrPackage);
-
-    for (const tag of tags) {
-        const ver = getVersionFromTag(tag);
-        if (ver !== undefined && ver !== "" && ver !== null) {
-            // eslint-disable-next-line no-await-in-loop
-            const date = await context.gitRepo.getCommitDate(tag);
-            versions.set(ver, date);
-        }
-    }
-
-    if (versions.size === 0) {
-        return undefined;
-    }
-
-    const toReturn: VersionDetails[] = [];
-    for (const [version, date] of versions) {
-        toReturn.push({ version, date });
-    }
-
-    return toReturn;
-}
-
-/**
- * Sorts an array of {@link VersionDetails} by version or date. The array will be cloned then sorted in place.
+ * Sorts an array of {@link ReleaseDetails} by version or date. The array will be cloned then sorted in place.
  *
  * @param versions - The array of versions to sort.
  * @param sortKey - The sort key.
@@ -482,7 +388,7 @@ export function sortVersions(
 }
 
 /**
- * Filters an array of {@link VersionDetails}, removing versions older than a specified number of business days.
+ * Filters an array of {@link ReleaseDetails}, removing versions older than a specified number of business days.
  *
  * @param versions - The array of versions to filter.
  * @param numBusinessDays - The number of business days to consider recent.
diff --git a/build-tools/packages/build-cli/test/lib/package.test.ts b/build-tools/packages/build-cli/test/lib/package.test.ts
index 6f8357d787c3..ddfbde724d7e 100644
--- a/build-tools/packages/build-cli/test/lib/package.test.ts
+++ b/build-tools/packages/build-cli/test/lib/package.test.ts
@@ -6,7 +6,9 @@ import { PackageName } from "@rushstack/node-core-library";
 import { assert } from "chai";
 import { parseJSON } from "date-fns";
 
-import { VersionDetails, generateReleaseGitTagName, sortVersions } from "../../src/lib/package";
+import { VersionDetails } from "@fluidframework/build-tools";
+
+import { generateReleaseGitTagName, sortVersions } from "../../src/lib/package";
 
 describe("VersionDetails sorting", async () => {
     const versions: VersionDetails[] = [
diff --git a/build-tools/packages/build-tools/src/bumpVersion/context.ts b/build-tools/packages/build-tools/src/bumpVersion/context.ts
index 39507db13f81..a18e595a591a 100644
--- a/build-tools/packages/build-tools/src/bumpVersion/context.ts
+++ b/build-tools/packages/build-tools/src/bumpVersion/context.ts
@@ -2,14 +2,16 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
+import { PackageName } from "@rushstack/node-core-library";
 import { strict as assert } from "assert";
 
 import { commonOptions } from "../common/commonOptions";
-import { FluidRepo, IPackageManifest } from "../common/fluidRepo";
-import { getPackageManifest } from "../common/fluidUtils";
+import { FluidRepo, IFluidBuildConfig, VersionDetails } from "../common/fluidRepo";
+import { getFluidBuildConfig } from "../common/fluidUtils";
 import { Logger, defaultLogger } from "../common/logging";
 import { MonoRepo, MonoRepoKind, isMonoRepoKind } from "../common/monoRepo";
 import { Package } from "../common/npmPackage";
+import { getVersionFromTag } from "../common/tags";
 import { Timer } from "../common/timer";
 import { GitRepo } from "./gitRepo";
 import { fatal, prereleaseSatisfies } from "./utils";
@@ -21,7 +23,7 @@ import { ReferenceVersionBag, VersionBag } from "./versionBag";
 export class Context {
     public readonly repo: FluidRepo;
     public readonly fullPackageMap: Map<string, Package>;
-    public readonly packageManifest: IPackageManifest;
+    public readonly rootFluidBuildConfig: IFluidBuildConfig;
 
     private readonly timer: Timer;
     private readonly newBranches: string[] = [];
@@ -40,7 +42,7 @@ export class Context {
         this.timer.time("Package scan completed");
 
         this.fullPackageMap = this.repo.createPackageMap();
-        this.packageManifest = getPackageManifest(this.repo.resolvedRoot);
+        this.rootFluidBuildConfig = getFluidBuildConfig(this.repo.resolvedRoot);
     }
 
     private reloadPackageJson() {
@@ -278,4 +280,95 @@ export class Context {
         }
         return ver;
     }
+
+    private _tags: Map<MonoRepoKind | string, string[]> = new Map();
+
+    /**
+     * Returns an array of all the git tags associated with a release group.
+     *
+     * @param releaseGroupOrPackage - The release group or independent package to get tags for.
+     * @returns An array of all all the tags for the release group or package.
+     *
+     * @internal
+     */
+    public async getTagsForReleaseGroup(
+        releaseGroupOrPackage: MonoRepoKind | string,
+    ): Promise<string[]> {
+        const prefix = isMonoRepoKind(releaseGroupOrPackage)
+            ? releaseGroupOrPackage.toLowerCase()
+            : PackageName.getUnscopedName(releaseGroupOrPackage);
+        const cacheEntry = this._tags.get(prefix);
+        if (cacheEntry !== undefined) {
+            return cacheEntry;
+        }
+
+        const tagList = await this.gitRepo.getAllTags(`${prefix}_v*`);
+        return tagList;
+    }
+
+    private _loaded = false;
+
+    /**
+     * Loads release data for all packages and release groups in the repo into memory.
+     */
+    public async loadReleases(): Promise<void> {
+        if (this._loaded) {
+            return;
+        }
+
+        const releasePromises: Promise<VersionDetails[] | undefined>[] = [];
+        for (const [kind] of this.repo.releaseGroups) {
+            releasePromises.push(this.getAllVersions(kind));
+        }
+        for (const p of this.independentPackages) {
+            releasePromises.push(this.getAllVersions(p.name));
+        }
+
+        await Promise.all(releasePromises);
+        this._loaded = true;
+    }
+
+    private _versions: Map<MonoRepoKind | string, VersionDetails[]> = new Map();
+
+    /**
+     * Gets all the versions for a release group or independent package. This function only considers the tags in the
+     * repo to determine releases and dates.
+     *
+     * @param releaseGroupOrPackage - The release group or independent package to get versions for.
+     * @returns An array of {@link ReleaseDetails} containing the version and date for each version.
+     *
+     * @internal
+     */
+    public async getAllVersions(
+        releaseGroupOrPackage: MonoRepoKind | string,
+    ): Promise<VersionDetails[] | undefined> {
+        const cacheEntry = this._versions.get(releaseGroupOrPackage);
+        if (cacheEntry !== undefined) {
+            return cacheEntry;
+        }
+
+        const versions = new Map<string, Date>();
+        const tags = await this.getTagsForReleaseGroup(releaseGroupOrPackage);
+
+        for (const tag of tags) {
+            const ver = getVersionFromTag(tag);
+            if (ver !== undefined && ver !== "" && ver !== null) {
+                // eslint-disable-next-line no-await-in-loop
+                const date = await this.gitRepo.getCommitDate(tag);
+                versions.set(ver, date);
+            }
+        }
+
+        if (versions.size === 0) {
+            return undefined;
+        }
+
+        const toReturn: VersionDetails[] = [];
+        for (const [version, date] of versions) {
+            toReturn.push({ version, date });
+        }
+
+        this._versions.set(releaseGroupOrPackage, toReturn);
+        return toReturn;
+    }
 }
diff --git a/build-tools/packages/build-tools/src/common/fluidRepo.ts b/build-tools/packages/build-tools/src/common/fluidRepo.ts
index a28f53fb9162..320ee21de73c 100644
--- a/build-tools/packages/build-tools/src/common/fluidRepo.ts
+++ b/build-tools/packages/build-tools/src/common/fluidRepo.ts
@@ -4,28 +4,61 @@
  */
 import * as path from "path";
 
-import { VersionBumpType } from "@fluid-tools/version-tools";
+import { ReleaseVersion, VersionBumpType } from "@fluid-tools/version-tools";
 
 import { PreviousVersionStyle } from "../typeValidator/packageJson";
-import { getPackageManifest } from "./fluidUtils";
+import { getFluidBuildConfig } from "./fluidUtils";
 import { Logger, defaultLogger } from "./logging";
 import { MonoRepo, MonoRepoKind, isMonoRepoKind } from "./monoRepo";
 import { Package, Packages, ScriptDependencies } from "./npmPackage";
 import { ExecAsyncResult } from "./utils";
 
-export interface IPackageManifest {
+/**
+ * Fluid build configuration that is expected in the repo-root package.json.
+ */
+export interface IFluidBuildConfig {
+    /**
+     * A mapping of package or release group names to metadata about the package or release group. This can only be
+     * configured in the rrepo-wide Fluid build config (the repo-root package.json).
+     */
     repoPackages: {
         [name: string]: IFluidRepoPackageEntry;
     };
+
+    /**
+     * dependencies defined here will be incorporated into fluid-build's build graph. This can be used to manually
+     * fluid-build about dependencies it doesn't automatically detect.
+     */
     buildDependencies?: {
         merge?: {
             [key: string]: ScriptDependencies;
         };
     };
+
+    /**
+     * @deprecated
+     */
     generatorName?: string;
+
+    /**
+     * Policy configuration for the `check:policy` command. This can only be configured in the rrepo-wide Fluid build
+     * config (the repo-root package.json).
+     */
     policy?: PolicyConfig;
+
+    /**
+     * A mapping of branch names to previous version baseline styles. The type test generator takes this information
+     * into account when calculating the baseline version to use when it's run on a particular branch. If this is not
+     * defined for a branch or package, then that package will be skipped during type test generation.
+     */
+    branchReleaseTypes?: {
+        [name: string]: VersionBumpType | PreviousVersionStyle;
+    };
 }
 
+/**
+ * Policy configuration for the `check:policy` command.
+ */
 export interface PolicyConfig {
     additionalLockfilePaths?: string[];
     dependencies?: {
@@ -33,9 +66,12 @@ export interface PolicyConfig {
     };
 }
 
+/**
+ * Configures a package or release group
+ */
 export interface IFluidRepoPackage {
     /**
-     * The path to the package.
+     * The path to the package. For release groups this should be the path to the root of the release group.
      */
     directory: string;
 
@@ -43,15 +79,6 @@ export interface IFluidRepoPackage {
      * An array of paths under `directory` that should be ignored.
      */
     ignoredDirs?: string[];
-
-    /**
-     * A mapping of branch names to previous version baseline styles. The type test generator takes this information
-     * into account when calculating the baseline version to use when it's run on a particular branch. If this is not
-     * defined for a branch or package, then that package will be skipped during type test generation.
-     */
-    branchReleaseTypes?: {
-        [name: string]: VersionBumpType | PreviousVersionStyle;
-    };
 }
 
 export type IFluidRepoPackageEntry = string | IFluidRepoPackage | (string | IFluidRepoPackage)[];
@@ -94,7 +121,7 @@ export class FluidRepo {
         services: boolean,
         private readonly logger: Logger = defaultLogger,
     ) {
-        const packageManifest = getPackageManifest(resolvedRoot);
+        const packageManifest = getFluidBuildConfig(resolvedRoot);
 
         // Expand to full IFluidRepoPackage and full path
         const normalizeEntry = (
@@ -175,3 +202,20 @@ export class FluidRepo {
         return FluidRepo.ensureInstalled(this.packages.packages);
     }
 }
+
+/**
+ * Represents a release version and its release date, if applicable.
+ *
+ * @internal
+ */
+export interface VersionDetails {
+    /**
+     * The version of the release.
+     */
+    version: ReleaseVersion;
+
+    /**
+     * The date the version was released, if applicable.
+     */
+    date?: Date;
+}
diff --git a/build-tools/packages/build-tools/src/common/fluidUtils.ts b/build-tools/packages/build-tools/src/common/fluidUtils.ts
index 511fa9d14f95..11fefc3eb5e1 100644
--- a/build-tools/packages/build-tools/src/common/fluidUtils.ts
+++ b/build-tools/packages/build-tools/src/common/fluidUtils.ts
@@ -5,7 +5,7 @@
 import * as path from "path";
 
 import { commonOptions } from "./commonOptions";
-import { IPackageManifest } from "./fluidRepo";
+import { IFluidBuildConfig } from "./fluidRepo";
 import { defaultLogger } from "./logging";
 import { existsSync, lookUpDirAsync, readJsonAsync, readJsonSync, realpathAsync } from "./utils";
 
@@ -17,7 +17,7 @@ async function isFluidRootLerna(dir: string) {
         verbose(`InferRoot: lerna.json not found`);
         return false;
     }
-    const rootPackageManifest = await getPackageManifest(dir);
+    const rootPackageManifest = await getFluidBuildConfig(dir);
     if (
         rootPackageManifest.repoPackages.server !== undefined &&
         !existsSync(path.join(dir, rootPackageManifest.repoPackages.server as string, "lerna.json"))
@@ -101,7 +101,13 @@ export async function getResolvedFluidRoot() {
     return await realpathAsync(resolvedRoot);
 }
 
-export function getPackageManifest(rootDir: string): IPackageManifest {
+/**
+ * Loads an IFluidBuildConfig from a package.json file in a directory.
+ *
+ * @param rootDir - The path to the root package.json to load.
+ * @returns The fluidBuild section of the package.json.
+ */
+export function getFluidBuildConfig(rootDir: string): IFluidBuildConfig {
     const jsonPath = path.join(rootDir, "package.json");
     if (!existsSync(jsonPath)) {
         throw new Error(`Root package.json not found in: ${rootDir}`);
diff --git a/build-tools/packages/build-tools/src/common/monoRepo.ts b/build-tools/packages/build-tools/src/common/monoRepo.ts
index 2ef01ef7cc5a..f2c9d6c64570 100644
--- a/build-tools/packages/build-tools/src/common/monoRepo.ts
+++ b/build-tools/packages/build-tools/src/common/monoRepo.ts
@@ -7,8 +7,9 @@ import * as path from "path";
 import YAML from "yaml";
 
 import { fatal } from "../bumpVersion/utils";
+import { IFluidBuildConfig } from "./fluidRepo";
 import { Logger, defaultLogger } from "./logging";
-import { Package, Packages } from "./npmPackage";
+import { Package, PackageJson, Packages } from "./npmPackage";
 import { execWithErrorAsync, existsSync, readJsonSync, rimrafWithErrorAsync } from "./utils";
 
 export type PackageManager = "npm" | "pnpm" | "yarn";
@@ -71,6 +72,7 @@ export class MonoRepo {
     public readonly version: string;
     public readonly workspaceGlobs: string[];
     public readonly packageManager: PackageManager;
+    private _packageJson: PackageJson;
 
     /**
      * Creates a new monorepo.
@@ -93,6 +95,12 @@ export class MonoRepo {
         const packagePath = path.join(repoPath, "package.json");
         let versionFromLerna = false;
 
+        if (!existsSync(packagePath)) {
+            throw new Error(`ERROR: package.json not found in ${repoPath}`);
+        }
+
+        this._packageJson = readJsonSync(packagePath);
+
         this.packageManager = existsSync(pnpmWorkspace)
             ? "pnpm"
             : existsSync(yarnLockPath)
@@ -127,21 +135,19 @@ export class MonoRepo {
             return;
         }
 
-        if (!existsSync(packagePath)) {
-            throw new Error(`ERROR: package.json not found in ${repoPath}`);
-        }
-        const pkgJson = readJsonSync(packagePath);
-        if (pkgJson.version === undefined && !versionFromLerna) {
-            this.version = pkgJson.version;
-            logger.verbose(`${kind}: Loading version (${pkgJson.version}) from ${packagePath}`);
+        if (this._packageJson.version === undefined && !versionFromLerna) {
+            this.version = this._packageJson.version;
+            logger.verbose(
+                `${kind}: Loading version (${this._packageJson.version}) from ${packagePath}`,
+            );
         }
 
-        if (pkgJson.workspaces !== undefined) {
+        if (this._packageJson.workspaces !== undefined) {
             logger.verbose(`${kind}: Loading packages from ${packagePath}`);
-            for (const dir of pkgJson.workspaces as string[]) {
+            for (const dir of this._packageJson.workspaces as string[]) {
                 this.packages.push(...Packages.loadGlob(dir, kind, ignoredDirs, this));
             }
-            this.workspaceGlobs = pkgJson.workspaces;
+            this.workspaceGlobs = this._packageJson.workspaces;
             return;
         }
         fatal(
@@ -161,6 +167,10 @@ export class MonoRepo {
             : "npm i --no-package-lock --no-shrinkwrap";
     }
 
+    public get fluidBuildConfig(): IFluidBuildConfig | undefined {
+        return this._packageJson.fluidBuild;
+    }
+
     public getNodeModulePath() {
         return path.join(this.repoPath, "node_modules");
     }
diff --git a/build-tools/packages/build-tools/src/common/npmPackage.ts b/build-tools/packages/build-tools/src/common/npmPackage.ts
index 450aed6b3af4..1b5708ed7cf1 100644
--- a/build-tools/packages/build-tools/src/common/npmPackage.ts
+++ b/build-tools/packages/build-tools/src/common/npmPackage.ts
@@ -10,7 +10,7 @@ import * as path from "path";
 import sortPackageJson from "sort-package-json";
 
 import { options } from "../fluidBuild/options";
-import { IPackageManifest } from "./fluidRepo";
+import { IFluidBuildConfig } from "./fluidRepo";
 import { defaultLogger } from "./logging";
 import { MonoRepo, MonoRepoKind, PackageManager } from "./monoRepo";
 import {
@@ -35,7 +35,10 @@ interface IPerson {
     url: string;
 }
 
-export interface IPackage {
+/**
+ * A type representing all relevant fields in package.json, including fluid-build-specific config.
+ */
+export interface PackageJson {
     name: string;
     version: string;
     private: boolean;
@@ -65,9 +68,58 @@ export interface IPackage {
     cpu: string[];
     [key: string]: any;
 
-    fluidBuild?: IPackageManifest;
+    /**
+     * fluid-build config. Some properties only apply when set in the root or release group root package.json.
+     */
+    fluidBuild?: IFluidBuildConfig;
+
+    /**
+     * type compatibility test configuration. This only takes effect when set in the package.json of a package. Setting
+     * it at the root of the repo or release group has no effect.
+     */
+    typeValidation?: {
+        /**
+         * The version of the package. Should match the version field in package.json.
+         */
+        version: string;
+
+        /**
+         * An object containing types that are known to be broken.
+         */
+        broken: BrokenCompatTypes;
+
+        /**
+         * If true, disables type test preparation and generation for the package.
+         */
+        disabled?: boolean;
+
+        /**
+         * The version range used as the "previous" version to compare against when generating type tests. This may be
+         * an exact version or a range string.
+         */
+        baselineRange?: string;
+
+        /**
+         * The exact version used as the "previous" version to compare against when generating type tests. This should
+         * always be an exact version.
+         */
+        baselineVersion?: string;
+    };
+}
+
+/**
+ * Metadata about known-broken types.
+ */
+export interface BrokenCompatSettings {
+    backCompat?: false;
+    forwardCompat?: false;
 }
 
+/**
+ * A mapping of a type name to its {@link BrokenCompatSettings}.
+ */
+export type BrokenCompatTypes = Partial<Record<string, BrokenCompatSettings>>;
+
 export class Package {
     private static packageCount: number = 0;
     private static readonly chalkColor = [
@@ -88,16 +140,15 @@ export class Package {
         chalk.default.whiteBright,
     ];
 
-    public get packageJson(): IPackage {
+    public get packageJson(): PackageJson {
         return this._packageJson;
     }
     private readonly packageId = Package.packageCount++;
     private _matched: boolean = false;
     private _markForBuild: boolean = false;
 
-    private _packageJson: IPackage;
+    private _packageJson: PackageJson;
     public readonly packageManager: PackageManager;
-
     constructor(
         private readonly packageJsonFileName: string,
         public readonly group: string,
@@ -126,6 +177,10 @@ export class Package {
         return this.packageJson.version;
     }
 
+    public get fluidBuildConfig(): IFluidBuildConfig | undefined {
+        return this._packageJson.fluidBuild;
+    }
+
     public get isPublished(): boolean {
         return !this.packageJson.private;
     }
@@ -155,7 +210,7 @@ export class Package {
     }
 
     public get combinedDependencies() {
-        const it = function* (packageJson: IPackage) {
+        const it = function* (packageJson: PackageJson) {
             for (const item in packageJson.dependencies) {
                 yield { name: item, version: packageJson.dependencies[item], dev: false };
             }
diff --git a/build-tools/packages/build-tools/src/common/tags.ts b/build-tools/packages/build-tools/src/common/tags.ts
new file mode 100644
index 000000000000..0ad5e9de3c47
--- /dev/null
+++ b/build-tools/packages/build-tools/src/common/tags.ts
@@ -0,0 +1,29 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+import * as semver from "semver";
+
+/**
+ * Parses the version from a git tag.
+ *
+ * @param tag - The tag.
+ * @returns - The version string, or undefined if one could not be found.
+ *
+ * @internal
+ */
+export function getVersionFromTag(tag: string): string | undefined {
+    // This is sufficient, but there is a possibility that this will fail if we add a tag that includes "_v" in its
+    // name.
+    const tagSplit = tag.split("_v");
+    if (tagSplit.length !== 2) {
+        return undefined;
+    }
+
+    const ver = semver.parse(tagSplit[1]);
+    if (ver === null) {
+        return undefined;
+    }
+
+    return ver.version;
+}
diff --git a/build-tools/packages/build-tools/src/index.ts b/build-tools/packages/build-tools/src/index.ts
index dc71e5e27556..f4896c5cfce0 100644
--- a/build-tools/packages/build-tools/src/index.ts
+++ b/build-tools/packages/build-tools/src/index.ts
@@ -16,7 +16,7 @@ export { GitRepo } from "./bumpVersion/gitRepo";
 export { releaseVersion } from "./bumpVersion/releaseVersion";
 export { exec, execNoError } from "./bumpVersion/utils";
 export { VersionBag } from "./bumpVersion/versionBag";
-export { FluidRepo } from "./common/fluidRepo";
+export { FluidRepo, VersionDetails } from "./common/fluidRepo";
 export { getResolvedFluidRoot } from "./common/fluidUtils";
 export { Logger, ErrorLoggingFunction, LoggingFunction } from "./common/logging";
 export { isMonoRepoKind, MonoRepo, MonoRepoKind, supportedMonoRepoValues } from "./common/monoRepo";
diff --git a/build-tools/packages/build-tools/src/repoPolicyCheck/handlers/lockfiles.ts b/build-tools/packages/build-tools/src/repoPolicyCheck/handlers/lockfiles.ts
index 2241f6a1ab41..64bc1a5fac9c 100644
--- a/build-tools/packages/build-tools/src/repoPolicyCheck/handlers/lockfiles.ts
+++ b/build-tools/packages/build-tools/src/repoPolicyCheck/handlers/lockfiles.ts
@@ -5,8 +5,8 @@
 import { unlinkSync } from "fs";
 import path from "path";
 
-import { IFluidRepoPackageEntry, IPackageManifest } from "../../common/fluidRepo";
-import { getPackageManifest } from "../../common/fluidUtils";
+import { IFluidBuildConfig, IFluidRepoPackageEntry } from "../../common/fluidRepo";
+import { getFluidBuildConfig } from "../../common/fluidUtils";
 import { Handler, readFile } from "../common";
 
 const lockFilePattern = /.*?package-lock\.json$/i;
@@ -15,7 +15,7 @@ const versionPattern = /"lockfileVersion"\s*:\s*\b1\b/g;
 
 let _knownPaths: string[] | undefined;
 
-const getKnownPaths = (manifest: IPackageManifest) => {
+const getKnownPaths = (manifest: IFluidBuildConfig) => {
     if (_knownPaths === undefined) {
         // Add the root path (.) because a lockfile is expected there
         _knownPaths = ["."];
@@ -84,7 +84,7 @@ export const handlers: Handler[] = [
         name: "extraneous-lockfiles",
         match: lockFilePattern,
         handler: (file, root) => {
-            const manifest = getPackageManifest(root);
+            const manifest = getFluidBuildConfig(root);
             const knownPaths: string[] = getKnownPaths(manifest);
 
             if (path.basename(file) === "package-lock.json") {
@@ -96,7 +96,7 @@ export const handlers: Handler[] = [
             return undefined;
         },
         resolver: (file, root): { resolved: boolean; message?: string } => {
-            const manifest = getPackageManifest(root);
+            const manifest = getFluidBuildConfig(root);
             const knownPaths: string[] = getKnownPaths(manifest);
 
             if (path.basename(file) === "package-lock.json") {
diff --git a/build-tools/packages/build-tools/src/repoPolicyCheck/handlers/npmPackages.ts b/build-tools/packages/build-tools/src/repoPolicyCheck/handlers/npmPackages.ts
index baeff5a58b88..686e560637d6 100644
--- a/build-tools/packages/build-tools/src/repoPolicyCheck/handlers/npmPackages.ts
+++ b/build-tools/packages/build-tools/src/repoPolicyCheck/handlers/npmPackages.ts
@@ -13,9 +13,9 @@ import * as readline from "readline";
 import replace from "replace-in-file";
 import sortPackageJson from "sort-package-json";
 
-import { IPackageManifest } from "../../common/fluidRepo";
-import { getPackageManifest } from "../../common/fluidUtils";
-import { IPackage } from "../../common/npmPackage";
+import { IFluidBuildConfig } from "../../common/fluidRepo";
+import { getFluidBuildConfig } from "../../common/fluidUtils";
+import { PackageJson } from "../../common/npmPackage";
 import { Handler, readFile, writeFile } from "../common";
 
 const licenseId = "MIT";
@@ -35,7 +35,7 @@ Use of Microsoft trademarks or logos in modified versions of this project must n
  */
 let _tildeDependencies: string[] | undefined;
 
-const getTildeDependencies = (manifest: IPackageManifest | undefined) => {
+const getTildeDependencies = (manifest: IFluidBuildConfig | undefined) => {
     if (_tildeDependencies === undefined) {
         _tildeDependencies = manifest?.policy?.dependencies?.requireTilde ?? [];
     }
@@ -498,7 +498,7 @@ export const handlers: Handler[] = [
         match,
         handler: (file, root) => {
             let jsonStr: string;
-            let json: IPackage;
+            let json: PackageJson;
             try {
                 jsonStr = readFile(file);
                 json = JSON.parse(jsonStr);
@@ -509,7 +509,7 @@ export const handlers: Handler[] = [
             const ret: string[] = [];
 
             const { dependencies, devDependencies } = json;
-            const manifest = getPackageManifest(root);
+            const manifest = getFluidBuildConfig(root);
             const tildeDependencies = getTildeDependencies(manifest);
             if (dependencies !== undefined) {
                 for (const [dep, ver] of Object.entries(json.dependencies)) {
diff --git a/build-tools/packages/build-tools/src/typeValidator/packageJson.ts b/build-tools/packages/build-tools/src/typeValidator/packageJson.ts
index 3f6a483ee944..f84b3956c419 100644
--- a/build-tools/packages/build-tools/src/typeValidator/packageJson.ts
+++ b/build-tools/packages/build-tools/src/typeValidator/packageJson.ts
@@ -20,51 +20,15 @@ import {
 } from "@fluid-tools/version-tools";
 
 import { Context } from "../bumpVersion/context";
-import { IFluidRepoPackage } from "../common/fluidRepo";
+import { BrokenCompatTypes, PackageJson } from "../common/npmPackage";
 
 export type PackageDetails = {
     readonly packageDir: string;
     readonly oldVersions: readonly string[];
     readonly broken: BrokenCompatTypes;
-    readonly pkg: PackageJson;
+    readonly json: PackageJson;
 };
 
-export interface BrokenCompatSettings {
-    backCompat?: false;
-    forwardCompat?: false;
-}
-
-export type BrokenCompatTypes = Partial<Record<string, BrokenCompatSettings>>;
-
-interface PackageJson {
-    name: string;
-    version: string;
-    main: string | undefined;
-    private: boolean | undefined;
-    devDependencies: Record<string, string>;
-    typeValidation?: {
-        /**
-         * The version of the package. Should match the version field in package.json.
-         */
-        version: string;
-
-        /**
-         * An object containing types that are known to be broken.
-         */
-        broken: BrokenCompatTypes;
-
-        /**
-         * If true, disables type test preparation and generation for the package.
-         */
-        disabled?: boolean;
-
-        /**
-         * The version used as the "previous" version to compare against when generating type tests.
-         */
-        baselineVersion?: string;
-    };
-}
-
 function createSortedObject<T>(obj: Record<string, T>): Record<string, T> {
     const sortedKeys = Object.keys(obj).sort();
     const sortedDeps: Record<string, T> = {};
@@ -96,7 +60,7 @@ export async function getPackageDetails(packageDir: string): Promise<PackageDeta
     );
 
     return {
-        pkg: pkgJson,
+        json: pkgJson,
         packageDir,
         oldVersions,
         broken: pkgJson.typeValidation?.broken ?? {},
@@ -107,6 +71,31 @@ export async function getPackageDetails(packageDir: string): Promise<PackageDeta
  * A type representing the different version constraint styles we use when determining the previous version for type
  * test generation.
  *
+ * The "base" versions are calculated by zeroing out all version segments lower than the base. That is, for a version v,
+ * the baseMajor version is `${v.major}.0.0` and the baseMinor version is `${v.major}.${v.minor}.0`.
+ *
+ * The "previous" versions work similarly, but the major/minor/patch segment is reduced by 1. That is, for a version v,
+ * the previousMajor version is `${min(v.major - 1, 1)}.0.0`, the previousMinor version is
+ * `${v.major}.${min(v.minor - 1, 0)}.0`, and the previousPatch is `${v.major}.${v.minor}.${min(v.patch - 1, 0)}.0`.
+ *
+ * The "previous" versions never roll back below 1 for the major version and 0 for minor and patch. That is, the
+ * previousMajor, previousMinor, and previousPatch versions for `1.0.0` are all `1.0.0`.
+ *
+ * @example
+ *
+ * Given the version 2.3.5:
+ *
+ * baseMajor: 2.0.0
+ * baseMinor: 2.3.0
+ * ~baseMinor: ~2.3.0
+ * previousPatch: 2.3.4
+ * previousMinor: 2.2.0
+ * previousMajor: 1.0.0
+ * ^previousMajor: ^1.0.0
+ * ^previousMinor: ^2.2.0
+ * ~previousMajor: ~1.0.0
+ * ~previousMinor: ~2.2.0
+ *
  * @example
  *
  * Given the version 2.0.0-internal.2.3.5:
@@ -115,8 +104,8 @@ export async function getPackageDetails(packageDir: string): Promise<PackageDeta
  * baseMinor: 2.0.0-internal.2.3.0
  * ~baseMinor: >=2.0.0-internal.2.3.0 <2.0.0-internal.3.0.0
  * previousPatch: 2.0.0-internal.2.3.4
- * previousMajor: 2.0.0-internal.1.0.0
  * previousMinor: 2.0.0-internal.2.2.0
+ * previousMajor: 2.0.0-internal.1.0.0
  * ^previousMajor: >=2.0.0-internal.1.0.0 <2.0.0-internal.2.0.0
  * ^previousMinor: >=2.0.0-internal.2.2.0 <2.0.0-internal.3.0.0
  * ~previousMajor: >=2.0.0-internal.1.0.0 <2.0.0-internal.1.1.0
@@ -130,8 +119,8 @@ export async function getPackageDetails(packageDir: string): Promise<PackageDeta
  * baseMinor: 2.0.0-internal.2.0.0
  * ~baseMinor: >=2.0.0-internal.2.0.0 <2.0.0-internal.2.1.0
  * previousPatch: 2.0.0-internal.2.0.0
- * previousMajor: 2.0.0-internal.1.0.0
  * previousMinor: 2.0.0-internal.2.0.0
+ * previousMajor: 2.0.0-internal.1.0.0
  * ^previousMajor: >=2.0.0-internal.1.0.0 <2.0.0-internal.2.0.0
  * ^previousMinor: >=2.0.0-internal.2.0.0 <2.0.0-internal.3.0.0
  * ~previousMajor: >=2.0.0-internal.1.0.0 <2.0.0-internal.1.1.0
@@ -140,12 +129,15 @@ export async function getPackageDetails(packageDir: string): Promise<PackageDeta
  * @internal
  */
 export type PreviousVersionStyle =
+    | PreviousVersionStyleRange
     | "baseMajor"
     | "baseMinor"
-    | "~baseMinor"
     | "previousPatch"
     | "previousMinor"
-    | "previousMajor"
+    | "previousMajor";
+
+export type PreviousVersionStyleRange =
+    | "~baseMinor"
     | "^previousMajor"
     | "^previousMinor"
     | "~previousMajor"
@@ -311,6 +303,10 @@ function getPreviousVersionBaseline(version: ReleaseVersion, style: PreviousVers
  * @param exactPreviousVersionString - If provided, this string will be used as the previous version string.
  * @param resetBroken - If true, clears the "broken" section of the type validation, effectively clearing all known
  * breaking changes.
+ * @param pinRange - If true, the version used will be the maximum released version that matches the range. This
+ * effectively pins the version to a specific version while allowing it to be updated manually as needed. This is
+ * functionally similar to what a lockfile does, but this provides us with an extra level of control so we don't rely on
+ * lockfiles (in which we have found bugs).
  * @returns package metadata or a reason the package was skipped.
  *
  * @internal
@@ -322,40 +318,51 @@ export async function getAndUpdatePackageDetails(
     style?: PreviousVersionStyle,
     exactPreviousVersionString?: string,
     resetBroken?: boolean,
+    pinRange = false,
 ): Promise<(PackageDetails & { skipReason?: undefined }) | { skipReason: string }> {
     const packageDetails = await getPackageDetails(packageDir);
-    const pkg = context.fullPackageMap.get(packageDetails.pkg.name);
+    const pkg = context.fullPackageMap.get(packageDetails.json.name);
     if (pkg === undefined) {
         return { skipReason: "Skipping package: not found in repo" };
-    } else if (packageDetails.pkg.name.startsWith("@fluid-internal")) {
+    } else if (packageDetails.json.name.startsWith("@fluid-internal")) {
         // @fluid-internal packages are intended for internal use only and are not typically published. We don't make
         // compatibility promises for them, so they're excluded from type tests.
         return { skipReason: "Skipping package: @fluid-internal" };
-    } else if (packageDetails.pkg.main?.endsWith("index.js") !== true) {
+    } else if (packageDetails.json.main?.endsWith("index.js") !== true) {
         // An index.js main entrypoint is required for type tests to be enabled.
         return { skipReason: "Skipping package: no index.js in main property" };
-    } else if (packageDetails.pkg.private === true) {
+    } else if (packageDetails.json.private === true) {
         // Private packages aren't published, so no need to do type testing for them.
         return { skipReason: "Skipping package: private package" };
-    } else if (packageDetails.pkg.typeValidation?.disabled === true) {
+    } else if (packageDetails.json.typeValidation?.disabled === true) {
         // Packages can explicitly opt out of type tests by setting typeValidation.disabled to true.
         return { skipReason: "Skipping package: type validation disabled" };
     }
 
     const releaseGroup = pkg.monoRepo?.kind;
-    if (releaseGroup === undefined || pkg.monoRepo === undefined) {
-        return { skipReason: `Package has no release group: ${pkg.name}` };
+    if (
+        (releaseGroup === undefined || pkg.monoRepo === undefined) &&
+        pkg.fluidBuildConfig?.branchReleaseTypes === undefined
+    ) {
+        return {
+            skipReason: `Skipping package: has no release group and no branch release type config in package.json: ${pkg.name}`,
+        };
     }
 
-    const releaseGroupConfig = context.packageManifest.repoPackages[pkg.monoRepo.kind];
+    const version = packageDetails.json.version;
+    const fluidConfig = pkg.monoRepo?.fluidBuildConfig ?? pkg.fluidBuildConfig;
     let releaseType: VersionBumpType | undefined;
     let previousVersionStyle: PreviousVersionStyle | undefined;
 
-    if (typeof releaseGroupConfig === "object") {
-        const rpg = releaseGroupConfig as IFluidRepoPackage;
-        const releaseTypes = rpg.branchReleaseTypes;
+    // the semver library uses null instead of undefined
+    let pinnedVersion: string | null = null;
+
+    if (fluidConfig !== undefined) {
+        const releaseTypes = fluidConfig.branchReleaseTypes;
         if (releaseTypes === undefined) {
-            return { skipReason: `Package has no branchReleaseTypes defined: ${pkg.name}` };
+            return {
+                skipReason: `Release group has no branchReleaseTypes defined: ${pkg.monoRepo?.kind}`,
+            };
         }
 
         for (const [branchPattern, branchReleaseType] of Object.entries(releaseTypes)) {
@@ -384,22 +391,38 @@ export async function getAndUpdatePackageDetails(
 
     if (previousVersionStyle === undefined) {
         // Skip if there's no previous version style defined for the package.
-        return { skipReason: "Skipping package: previousVersionStyle is undefined" };
+        return { skipReason: "Skipping package: no previousVersionStyle is defined for the branch" };
     }
 
-    const version = packageDetails.pkg.version;
-    let prevVersion: string;
-
-    if (exactPreviousVersionString === undefined) {
-        prevVersion = getPreviousVersionBaseline(version, previousVersionStyle);
-    } else {
-        prevVersion = exactPreviousVersionString;
+    const baseline = getPreviousVersionBaseline(version, previousVersionStyle);
+    if (
+        pinRange &&
+        (previousVersionStyle?.startsWith("~") || previousVersionStyle?.startsWith("^"))
+    ) {
+        const name = pkg.monoRepo?.kind ?? pkg.name;
+        const releases = await context.getAllVersions(name);
+        if (releases === undefined) {
+            // Skip if there's no versions found in the repo
+            return { skipReason: "Skipping package: no releases found" };
+        }
+        const versions = releases.map((v) => v.version);
+        pinnedVersion = semver.maxSatisfying(versions, baseline);
+        if (pinnedVersion === null) {
+            return {
+                skipReason: `Skipping package: couldn't calculate a pinned version for '${name}'`,
+            };
+        }
     }
 
+    const prevVersion =
+        exactPreviousVersionString === undefined
+            ? pinnedVersion ?? baseline
+            : exactPreviousVersionString;
+
     // check that the version exists on npm before trying to add the
     // dev dep and bumping the typeValidation version
     // if the version does not exist, we will defer updating the package
-    const packageDef = `${packageDetails.pkg.name}@${prevVersion}`;
+    const packageDef = `${packageDetails.json.name}@${prevVersion}`;
     const args = ["view", `"${packageDef}"`, "version", "--json"];
     const result = child_process.execSync(`npm ${args.join(" ")}`, { cwd: packageDir }).toString();
     const maybeVersions = result?.length > 0 ? safeParse(result, args.join(" ")) : undefined;
@@ -414,33 +437,36 @@ export async function getAndUpdatePackageDetails(
     if (versionsArray.length === 0) {
         return { skipReason: `Skipping package: ${packageDef} not found on npm` };
     } else {
-        packageDetails.pkg.devDependencies[
-            `${packageDetails.pkg.name}-previous`
+        packageDetails.json.devDependencies[
+            `${packageDetails.json.name}-previous`
         ] = `npm:${packageDef}`;
 
-        packageDetails.pkg.devDependencies = createSortedObject(packageDetails.pkg.devDependencies);
-        const disabled = packageDetails.pkg.typeValidation?.disabled;
+        packageDetails.json.devDependencies = createSortedObject(
+            packageDetails.json.devDependencies,
+        );
+        const disabled = packageDetails.json.typeValidation?.disabled;
 
-        packageDetails.pkg.typeValidation = {
+        packageDetails.json.typeValidation = {
             version,
-            baselineVersion: prevVersion,
-            broken: resetBroken === true ? {} : packageDetails.pkg.typeValidation?.broken ?? {},
+            baselineRange: baseline,
+            baselineVersion: baseline === prevVersion ? undefined : prevVersion,
+            broken: resetBroken === true ? {} : packageDetails.json.typeValidation?.broken ?? {},
         };
 
         if (disabled !== undefined) {
-            packageDetails.pkg.typeValidation.disabled = disabled;
+            packageDetails.json.typeValidation.disabled = disabled;
         }
 
         if ((writeUpdates ?? false) === true) {
             await util.promisify(fs.writeFile)(
                 `${packageDir}/package.json`,
-                JSON.stringify(packageDetails.pkg, undefined, 2).concat("\n"),
+                JSON.stringify(packageDetails.json, undefined, 2).concat("\n"),
             );
         }
     }
 
-    const oldVersions = Object.keys(packageDetails.pkg.devDependencies ?? {}).filter((k) =>
-        k.startsWith(packageDetails.pkg.name),
+    const oldVersions = Object.keys(packageDetails.json.devDependencies ?? {}).filter((k) =>
+        k.startsWith(packageDetails.json.name),
     );
     return {
         ...packageDetails,
diff --git a/build-tools/packages/build-tools/src/typeValidator/repoValidator.ts b/build-tools/packages/build-tools/src/typeValidator/repoValidator.ts
index 6c51b0e0c060..cd9f2aecf825 100644
--- a/build-tools/packages/build-tools/src/typeValidator/repoValidator.ts
+++ b/build-tools/packages/build-tools/src/typeValidator/repoValidator.ts
@@ -6,7 +6,7 @@ import minimatch from "minimatch";
 import path from "path";
 
 import { IFluidRepoPackageEntry } from "../common/fluidRepo";
-import { getPackageManifest } from "../common/fluidUtils";
+import { getFluidBuildConfig } from "../common/fluidUtils";
 import { getResolvedFluidRoot } from "../common/fluidUtils";
 import { FluidRepoBuild } from "../fluidBuild/fluidRepoBuild";
 import { getPackageDetails } from "./packageJson";
@@ -43,7 +43,7 @@ export interface IValidationOptions {
 export type RepoValidationResult = Map<string, { level: BreakingIncrement; group?: string }>;
 
 function buildPackageGroups(repoRoot: string): PackageGroup[] {
-    const manifest = getPackageManifest(repoRoot);
+    const manifest = getFluidBuildConfig(repoRoot);
     const groups: PackageGroup[] = [];
     const repoPackages = manifest.repoPackages ?? [];
     const addGroup = (name: string, entry: IFluidRepoPackageEntry) => {
@@ -177,11 +177,11 @@ export async function validateRepo(options?: IValidationOptions): Promise<RepoVa
                         groupBreaks,
                     );
 
-                    if (breakResult.has(packageData.pkg.name)) {
+                    if (breakResult.has(packageData.json.name)) {
                         throw new Error("Encountered duplicated package name");
                     }
 
-                    breakResult.set(packageData.pkg.name, { level: increment, group: groupName });
+                    breakResult.set(packageData.json.name, { level: increment, group: groupName });
                 }
 
                 packages.delete(pkgName);
diff --git a/build-tools/packages/version-tools/src/semver.ts b/build-tools/packages/version-tools/src/semver.ts
index 99ae6c639500..5627afaea0cc 100644
--- a/build-tools/packages/version-tools/src/semver.ts
+++ b/build-tools/packages/version-tools/src/semver.ts
@@ -195,7 +195,7 @@ export function isPrereleaseVersion(version: string | semver.SemVer | undefined)
  * internal and virtualPatch version schemes.
  *
  * @param version - The version to calculate previous versions for.
- * @returns A tuple of previous major version and previous minor version.
+ * @returns A 3-tuple of previous major, minor, and patch versions.
  *
  * @remarks
  *
@@ -260,7 +260,7 @@ export function getPreviousVersions(
             throw new Error(`Couldn't parse version string: ${version}`);
         }
 
-        previousMajorVersion = ver.major <= 1 ? undefined : `${ver.major - 1}.0.0`;
+        previousMajorVersion = ver.major <= 1 ? "1.0.0" : `${ver.major - 1}.0.0`;
         previousMinorVersion =
             ver.minor === 0 && ver.major === 0
                 ? undefined
diff --git a/build-tools/packages/version-tools/src/test/semver.test.ts b/build-tools/packages/version-tools/src/test/semver.test.ts
index df83e35ca673..57ee38ca9feb 100644
--- a/build-tools/packages/version-tools/src/test/semver.test.ts
+++ b/build-tools/packages/version-tools/src/test/semver.test.ts
@@ -680,7 +680,7 @@ describe("semver", () => {
     describe("getPreviousVersions", () => {
         it("1.3.3", () => {
             const input = `1.3.3`;
-            const [expected1, expected2] = [undefined, `1.2.0`];
+            const [expected1, expected2] = [`1.0.0`, `1.2.0`];
             const [result1, result2] = getPreviousVersions(input);
             assert.equal(result1, expected1, "previous major version mismatch");
             assert.equal(result2, expected2, "previous minor version mismatch");
@@ -758,6 +758,14 @@ describe("semver", () => {
             assert.equal(result2, expected2, "previous minor version mismatch");
         });
 
+        it("2.0.0-internal.2.2.0", () => {
+            const input = `2.0.0-internal.2.2.0`;
+            const [expected1, expected2] = [`2.0.0-internal.1.0.0`, `2.0.0-internal.2.1.0`];
+            const [result1, result2] = getPreviousVersions(input);
+            assert.equal(result1, expected1, "previous major version mismatch");
+            assert.equal(result2, expected2, "previous minor version mismatch");
+        });
+
         it("2.0.0-internal.3.0.0", () => {
             const input = `2.0.0-internal.3.0.0`;
             const [expected1, expected2] = [`2.0.0-internal.2.0.0`, `2.0.0-internal.3.0.0`];
diff --git a/common/lib/common-definitions/package.json b/common/lib/common-definitions/package.json
index 2770cf8ac0f2..e1660c6ab19d 100644
--- a/common/lib/common-definitions/package.json
+++ b/common/lib/common-definitions/package.json
@@ -56,6 +56,12 @@
     "rimraf": "^2.6.2",
     "typescript": "~4.5.5"
   },
+  "fluidBuild": {
+    "branchReleaseTypes": {
+      "main": "minor",
+      "release/**": "patch"
+    }
+  },
   "typeValidation": {
     "version": "1.0.0",
     "broken": {}
diff --git a/common/lib/common-utils/package.json b/common/lib/common-utils/package.json
index 82c8aeb21db5..d52f86bdc753 100644
--- a/common/lib/common-utils/package.json
+++ b/common/lib/common-utils/package.json
@@ -122,6 +122,12 @@
     "outputDirectory": "nyc",
     "outputName": "jest-junit-report.xml"
   },
+  "fluidBuild": {
+    "branchReleaseTypes": {
+      "main": "minor",
+      "release/**": "patch"
+    }
+  },
   "typeValidation": {
     "version": "1.1.0",
     "broken": {}
diff --git a/common/lib/protocol-definitions/package.json b/common/lib/protocol-definitions/package.json
index bcb328124db1..78594e2a0513 100644
--- a/common/lib/protocol-definitions/package.json
+++ b/common/lib/protocol-definitions/package.json
@@ -59,6 +59,12 @@
     "typescript": "~4.5.5",
     "typescript-formatter": "7.1.0"
   },
+  "fluidBuild": {
+    "branchReleaseTypes": {
+      "main": "minor",
+      "release/**": "patch"
+    }
+  },
   "typeValidation": {
     "version": "1.2.0",
     "broken": {}
diff --git a/package.json b/package.json
index 7b8012024331..d45a8d17d7ce 100644
--- a/package.json
+++ b/package.json
@@ -138,25 +138,12 @@
       "common-def": "common/lib/common-definitions",
       "common-utils": "common/lib/common-utils",
       "protocol-def": "common/lib/protocol-definitions",
-      "azure": {
-        "directory": "azure",
-        "branchReleaseTypes": {
-          "main": "major",
-          "lts": "minor",
-          "release/azure/*": "patch"
-        }
-      },
+      "azure": "azure",
       "build-tools": "build-tools",
       "server": "server/routerlicious",
       "client": {
         "directory": "",
-        "ignoredDirs": [],
-        "branchReleaseTypes": {
-          "main": "minor",
-          "lts": "minor",
-          "release/**": "patch",
-          "next": "major"
-        }
+        "ignoredDirs": []
       },
       "tools": [
         "tools/api-markdown-documenter",
@@ -198,6 +185,12 @@
         "server/historian",
         "tools/telemetry-generator"
       ]
+    },
+    "branchReleaseTypes": {
+      "main": "minor",
+      "lts": "minor",
+      "release/**": "patch",
+      "next": "major"
     }
   }
 }

From 4eda5968cfca70f2b1a241ac00ab4d922e73ee7a Mon Sep 17 00:00:00 2001
From: Tyler Butler <tyler@tylerbutler.com>
Date: Tue, 15 Nov 2022 18:34:04 -0800
Subject: [PATCH 17/22] docs

---
 .../build-cli/docs/typetestDetails.md         | 26 +++++++------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/build-tools/packages/build-cli/docs/typetestDetails.md b/build-tools/packages/build-cli/docs/typetestDetails.md
index 11e5225a9205..b614a251c2ea 100644
--- a/build-tools/packages/build-cli/docs/typetestDetails.md
+++ b/build-tools/packages/build-cli/docs/typetestDetails.md
@@ -56,23 +56,17 @@ but this can be suppressed with the `--no-generateInName` flag.
 
 Type tests can be configured to use different baseline versions on a given branch depending on the type of release that
 the branch is designated for. For example, for the client release group, the _next_ branch is the _major version series
-branch_ and _main_ is the _minor version series branch_. This can be declared in the root package.json, in the
-`fluidBuild.repoPackages` section. For example, the following configuration designates the _main_ and _lts_ branches as
-minor version series branches, while the _next_ branch is designated for major releases.
+branch_ and _main_ is the _minor version series branch_. This can be declared in the root package.json for the release
+group, in the `fluidBuild.repoPackages` section. For example, the following configuration designates the _main_ and
+_lts_ branches as minor version series branches, while the _next_ branch is designated for major releases.
 
 ```json
 "fluidBuild": {
-  "repoPackages": {
-    "client": {
-      "directory": "",
-      "ignoredDirs": [],
-      "branchReleaseTypes": {
-        "main": "minor",
-        "lts": "minor",
-        "release/**": "patch",
-        "next": "major"
-      }
-    }
+  "branchReleaseTypes": {
+    "main": "minor",
+    "lts": "minor",
+    "release/**": "patch",
+    "next": "major"
   }
 }
 ```
@@ -104,10 +98,10 @@ designation. To do this, you can use any of the following strings instead of maj
 -   `~previousMajor`
 -   `~previousMinor`
 
-The "base" versions are calculated by zeroing out all version segments lower than the base. That is, for a version v,
+The "base" versions are calculated by zeroing out all version segments lower than the base. That is, for a version _v_,
 the baseMajor version is `${v.major}.0.0` and the baseMinor version is `${v.major}.${v.minor}.0`.
 
-The "previous" versions work similarly, but the major/minor/patch segment is reduced by 1. That is, for a version v,
+The "previous" versions work similarly, but the major/minor/patch segment is reduced by 1. That is, for a version _v_,
 the previousMajor version is `${min(v.major - 1, 1)}.0.0`, the previousMinor version is
 `${v.major}.${min(v.minor - 1, 0)}.0`, and the previousPatch is `${v.major}.${v.minor}.${min(v.patch - 1, 0)}.0`.
 

From 3dbdff3bb49eb4255f3b5bdaf6e6d0a507b39ac6 Mon Sep 17 00:00:00 2001
From: Tyler Butler <tyler@tylerbutler.com>
Date: Tue, 15 Nov 2022 18:38:06 -0800
Subject: [PATCH 18/22] policy

---
 azure/package.json                   | 8 ++++----
 common/lib/common-utils/package.json | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/azure/package.json b/azure/package.json
index 5b28432af494..c9c2cb945d2d 100644
--- a/azure/package.json
+++ b/azure/package.json
@@ -98,15 +98,15 @@
     "run-script-os": "^1.1.6",
     "typescript": "~4.5.5"
   },
+  "engines": {
+    "node": ">=14.13.0",
+    "npm": "^6"
+  },
   "fluidBuild": {
     "branchReleaseTypes": {
       "main": "major",
       "lts": "minor",
       "release/azure/*": "patch"
     }
-  },
-  "engines": {
-    "node": ">=14.13.0",
-    "npm": "^6"
   }
 }
diff --git a/common/lib/common-utils/package.json b/common/lib/common-utils/package.json
index d52f86bdc753..47c8b5401e20 100644
--- a/common/lib/common-utils/package.json
+++ b/common/lib/common-utils/package.json
@@ -118,16 +118,16 @@
     "ts-node": "^7.0.1",
     "typescript": "~4.5.5"
   },
-  "jest-junit": {
-    "outputDirectory": "nyc",
-    "outputName": "jest-junit-report.xml"
-  },
   "fluidBuild": {
     "branchReleaseTypes": {
       "main": "minor",
       "release/**": "patch"
     }
   },
+  "jest-junit": {
+    "outputDirectory": "nyc",
+    "outputName": "jest-junit-report.xml"
+  },
   "typeValidation": {
     "version": "1.1.0",
     "broken": {}

From 85df5c815e45d0e342a08e4e6a398f7f10aa66b8 Mon Sep 17 00:00:00 2001
From: Tyler Butler <tyler@tylerbutler.com>
Date: Tue, 15 Nov 2022 18:54:21 -0800
Subject: [PATCH 19/22] fixup

---
 build-tools/package.json | 4 ++--
 package.json             | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/build-tools/package.json b/build-tools/package.json
index 39984ad52e9e..d93b76071e98 100644
--- a/build-tools/package.json
+++ b/build-tools/package.json
@@ -39,8 +39,8 @@
     "lerna": "lerna",
     "lint": "lerna run lint --no-sort --stream -- -- -- --color",
     "lint:fix": "lerna run lint:fix --no-sort --stream -- -- -- --color",
-    "policy-check": "cd .. && node build-tools/packages/build-tools/dist/repoPolicyCheck/repoPolicyCheck.js",
-    "policy-check:fix": "npm run policy-check -- -r",
+    "policy-check": "cd .. && npm run policy-check",
+    "policy-check:fix": "npm run policy-check -- -- --fix",
     "post-lerna-install:default": "[ -f package-lock.json ] && mv package-lock.json lerna-package-lock.json; [ -f package-lock.json.bak ] && mv package-lock.json.bak package-lock.json; exit 0",
     "post-lerna-install:win32": "if exist package-lock.json move package-lock.json lerna-package-lock.json && if exist package-lock.json.bak move package-lock.json.bak package-lock.json",
     "postinstall:lerna": "run-script-os",
diff --git a/package.json b/package.json
index 3220c204cd36..f7b2e6828796 100644
--- a/package.json
+++ b/package.json
@@ -181,7 +181,6 @@
         ]
       },
       "additionalLockfilePaths": [
-        "azure",
         "common/build/build-common",
         "common/build/eslint-config-fluid",
         "docs",

From 71ea4ae22f781476cb62b62fb5087672abe3d329 Mon Sep 17 00:00:00 2001
From: Tyler Butler <tyler@tylerbutler.com>
Date: Wed, 16 Nov 2022 10:31:25 -0800
Subject: [PATCH 20/22] add docs on pinning

---
 build-tools/packages/build-cli/docs/generate.md    | 11 ++++++++---
 .../packages/build-cli/docs/typetestDetails.md     | 14 ++++++++++++++
 .../build-cli/src/commands/generate/typetests.ts   |  9 ++++++---
 .../build-tools/src/typeValidator/packageJson.ts   |  9 ++++-----
 4 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/build-tools/packages/build-cli/docs/generate.md b/build-tools/packages/build-cli/docs/generate.md
index 56ae872c3ea6..c23ebc05daec 100644
--- a/build-tools/packages/build-cli/docs/generate.md
+++ b/build-tools/packages/build-cli/docs/generate.md
@@ -129,8 +129,9 @@ FLAGS
       The type of version constraint to use for previous versions. Only applies to the prepare phase. This overrides the
       branch-specific configuration in package.json, which is used by default.
 
-      For more information about the options, see <https://github.com/microsoft/FluidFramework/blob/main/build-tools/packa
-      ges/build-cli/docs/typetestDetails.md#configuring-a-branch-for-a-specific-baseline>
+      For more information about the options, see https://github.com/microsoft/FluidFramework/blob/main/build-tools/packag
+      es/build-cli/docs/typetestDetails.md#configuring-a-branch-for-a-specific-baseline
+
       <options: ^previousMajor|^previousMinor|~previousMajor|~previousMinor|previousMajor|previousMinor|previousPatch|base
       Minor|baseMajor|~baseMinor>
 
@@ -152,7 +153,11 @@ FLAGS
       packages.
 
   --pin
-      Searches the release git tags in the repo and pins the baseline version range to the maximum matching release.
+      Searches the release git tags in the repo and selects the baseline version as the maximum
+      eleased version that matches the range.
+
+      This effectively pins the version to a specific version while allowing it to be updated manually as
+      needed by running type test preparation again.
 
   --prepare
       Prepares the package.json only. Doesn't generate tests. Note that npm install may need to be run after preparation.
diff --git a/build-tools/packages/build-cli/docs/typetestDetails.md b/build-tools/packages/build-cli/docs/typetestDetails.md
index b614a251c2ea..7e888c050d9f 100644
--- a/build-tools/packages/build-cli/docs/typetestDetails.md
+++ b/build-tools/packages/build-cli/docs/typetestDetails.md
@@ -154,3 +154,17 @@ Given the version 2.0.0-internal.2.0.0:
 | `^previousMinor`       | >=2.0.0-internal.2.0.0 <2.0.0-internal.3.0.0  |
 | `~previousMajor`       | >=2.0.0-internal.1.0.0 <2.0.0-internal.1.1.0  |
 | `~previousMinor`       | >=2.0.0-internal.2.0.0 <2.0.0-internal.2.1.0  |
+
+## Pinning to a specific version
+
+This is useful when you want to regularly update the baseline version when releases happen, but only when explicitly
+updated, such as part of a release process. You can do this with a combination of a baseline range such as
+`^previousMajor` and the `--pin` flag.
+
+The `--pin` flag searches the release git tags in the repo and selects the baseline version as the maximum released
+version that matches the range. This effectively pins the version to a specific version while allowing it to be updated
+manually as needed by running type test preparation again.
+
+This is functionally similar to what a lockfile does, but this provides us with an extra level of control so we don't
+rely on lockfiles for type test package versions, because we have found bugs in lockfile handling related to npm
+aliases, which the type test infrastructure relies on.
diff --git a/build-tools/packages/build-cli/src/commands/generate/typetests.ts b/build-tools/packages/build-cli/src/commands/generate/typetests.ts
index 5802a9de9904..548a26949b84 100644
--- a/build-tools/packages/build-cli/src/commands/generate/typetests.ts
+++ b/build-tools/packages/build-cli/src/commands/generate/typetests.ts
@@ -58,7 +58,7 @@ export default class GenerateTypeTestsCommand extends BaseCommand<
             char: "s",
             description: `The type of version constraint to use for previous versions. Only applies to the prepare phase. This overrides the branch-specific configuration in package.json, which is used by default.
 
-                For more information about the options, see <https://github.com/microsoft/FluidFramework/blob/main/build-tools/packages/build-cli/docs/typetestDetails.md#configuring-a-branch-for-a-specific-baseline>`,
+                For more information about the options, see https://github.com/microsoft/FluidFramework/blob/main/build-tools/packages/build-cli/docs/typetestDetails.md#configuring-a-branch-for-a-specific-baseline\n`,
             options: [
                 "^previousMajor",
                 "^previousMinor",
@@ -73,8 +73,11 @@ export default class GenerateTypeTestsCommand extends BaseCommand<
             ],
         }),
         pin: Flags.boolean({
-            description:
-                "Searches the release git tags in the repo and pins the baseline version range to the maximum matching release.",
+            description: `Searches the release git tags in the repo and selects the baseline version as the maximum
+            eleased version that matches the range.
+
+            This effectively pins the version to a specific version while allowing it to be updated manually as
+            needed by running type test preparation again.`,
             default: false,
         }),
         exact: Flags.string({
diff --git a/build-tools/packages/build-tools/src/typeValidator/packageJson.ts b/build-tools/packages/build-tools/src/typeValidator/packageJson.ts
index f84b3956c419..bbddcf5245e8 100644
--- a/build-tools/packages/build-tools/src/typeValidator/packageJson.ts
+++ b/build-tools/packages/build-tools/src/typeValidator/packageJson.ts
@@ -129,14 +129,11 @@ export async function getPackageDetails(packageDir: string): Promise<PackageDeta
  * @internal
  */
 export type PreviousVersionStyle =
-    | PreviousVersionStyleRange
     | "baseMajor"
     | "baseMinor"
     | "previousPatch"
     | "previousMinor"
-    | "previousMajor";
-
-export type PreviousVersionStyleRange =
+    | "previousMajor"
     | "~baseMinor"
     | "^previousMajor"
     | "^previousMinor"
@@ -391,7 +388,9 @@ export async function getAndUpdatePackageDetails(
 
     if (previousVersionStyle === undefined) {
         // Skip if there's no previous version style defined for the package.
-        return { skipReason: "Skipping package: no previousVersionStyle is defined for the branch" };
+        return {
+            skipReason: "Skipping package: no previousVersionStyle is defined for the branch",
+        };
     }
 
     const baseline = getPreviousVersionBaseline(version, previousVersionStyle);

From 29cd50958af7ac1a34525f89a81e6a7caef7321b Mon Sep 17 00:00:00 2001
From: Tyler Butler <tyler@tylerbutler.com>
Date: Wed, 16 Nov 2022 10:44:53 -0800
Subject: [PATCH 21/22] Update
 build-tools/packages/build-cli/src/lib/package.ts

---
 build-tools/packages/build-cli/src/lib/package.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-tools/packages/build-cli/src/lib/package.ts b/build-tools/packages/build-cli/src/lib/package.ts
index 7063a1e1c1c3..6ecbd80e1408 100644
--- a/build-tools/packages/build-cli/src/lib/package.ts
+++ b/build-tools/packages/build-cli/src/lib/package.ts
@@ -388,7 +388,7 @@ export function sortVersions(
 }
 
 /**
- * Filters an array of {@link ReleaseDetails}, removing versions older than a specified number of business days.
+ * Filters an array of {@link VersionDetails}, removing versions older than a specified number of business days.
  *
  * @param versions - The array of versions to filter.
  * @param numBusinessDays - The number of business days to consider recent.

From 5660bd243db151de6b870941fcdc9fb7a1c12a2b Mon Sep 17 00:00:00 2001
From: Tyler Butler <tyler@tylerbutler.com>
Date: Wed, 16 Nov 2022 11:08:04 -0800
Subject: [PATCH 22/22] cleanup

---
 .../packages/build-cli/src/commands/release/history.ts | 10 +++-------
 .../packages/build-cli/src/commands/release/report.ts  |  3 +--
 build-tools/packages/build-cli/src/lib/index.ts        |  3 ---
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/build-tools/packages/build-cli/src/commands/release/history.ts b/build-tools/packages/build-cli/src/commands/release/history.ts
index 008301bebea7..95bb9c0f0711 100644
--- a/build-tools/packages/build-cli/src/commands/release/history.ts
+++ b/build-tools/packages/build-cli/src/commands/release/history.ts
@@ -6,16 +6,12 @@ import { Flags } from "@oclif/core";
 import chalk from "chalk";
 import { table } from "table";
 
+import { VersionDetails } from "@fluidframework/build-tools";
+
 import { detectBumpType } from "@fluid-tools/version-tools";
 
 import { packageSelectorFlag, releaseGroupFlag } from "../../flags";
-import {
-    ReleaseReport,
-    VersionDetails,
-    getDisplayDate,
-    getDisplayDateRelative,
-    sortVersions,
-} from "../../lib";
+import { ReleaseReport, getDisplayDate, getDisplayDateRelative, sortVersions } from "../../lib";
 import { ReleaseGroup, ReleasePackage } from "../../releaseGroups";
 import { ReleaseReportBaseCommand, ReleaseSelectionMode } from "./report";
 
diff --git a/build-tools/packages/build-cli/src/commands/release/report.ts b/build-tools/packages/build-cli/src/commands/release/report.ts
index 706f573bffda..7f1ae7769fd6 100644
--- a/build-tools/packages/build-cli/src/commands/release/report.ts
+++ b/build-tools/packages/build-cli/src/commands/release/report.ts
@@ -28,7 +28,6 @@ import {
     PackageVersionMap,
     ReleaseReport,
     ReportKind,
-    VersionDetails,
     filterVersionsOlderThan,
     getDisplayDate,
     getDisplayDateRelative,
@@ -204,7 +203,7 @@ export abstract class ReleaseReportBaseCommand<
         repoVersion: string,
         latestReleaseChooseMode?: ReleaseSelectionMode,
     ): Promise<RawReleaseData | undefined> {
-        const versions = await getAllVersions(context, releaseGroupOrPackage);
+        const versions = await context.getAllVersions(releaseGroupOrPackage);
 
         if (versions === undefined) {
             return undefined;
diff --git a/build-tools/packages/build-cli/src/lib/index.ts b/build-tools/packages/build-cli/src/lib/index.ts
index 55bf04e86f25..1cdd04ce2db0 100644
--- a/build-tools/packages/build-cli/src/lib/index.ts
+++ b/build-tools/packages/build-cli/src/lib/index.ts
@@ -25,11 +25,8 @@ export { Repository } from "./git";
 export {
     filterVersionsOlderThan,
     generateReleaseGitTagName,
-    getAllVersions,
     getFluidDependencies,
     getPreReleaseDependencies,
-    getTagsForReleaseGroup,
-    getVersionFromTag,
     isReleased,
     npmCheckUpdates,
     PackageVersionMap,