diff --git a/.agents/skills/release-notes/SKILL.md b/.agents/skills/release-notes/SKILL.md
index 12fa6ca13d17..c6827430ef13 100644
--- a/.agents/skills/release-notes/SKILL.md
+++ b/.agents/skills/release-notes/SKILL.md
@@ -1,7 +1,7 @@
 ---
 name: release-notes
 description: >
-  Generate or regenerate SkiaSharp's website release notes AND API changelogs as one
+  Generate or regenerate SkiaSharp's website release notes AND API diffs as one
   coherent set under documentation/docfx/releases/. Two phases: (1) Prepare — one script
   (scripts/generate.sh) regenerates everything deterministic (the API-diff tree +
   co-release-map sidecar from the published NuGet feed, and each version page's raw-data
@@ -10,13 +10,13 @@ description: >
 
   Use this skill whenever the user asks to:
   - Generate or regenerate release notes for a version ("write release notes for 3.119.2")
-  - Regenerate or refresh the API changelogs / API diff ("update the api diff", "regen changelogs")
+  - Regenerate or refresh the API diffs ("update the api diff", "regen the api diffs")
   - Refresh the whole releases/ set after publishing packages
   - Manually fix or update release notes that the automated workflow got wrong
 
-  Triggers: "release notes for X", "regenerate release notes", "update API changelogs",
-  "api diff", "changelog", "update website release notes", "write release notes",
-  "refresh release notes".
+  Triggers: "release notes for X", "regenerate release notes", "update API diffs",
+  "api diff", "update website release notes", "write release notes",
+  "refresh release notes". Also matches the legacy term "changelog" / "API changelog".
 
     NOTE: The full set is normally regenerated automatically by the `update-release-notes`
   agentic workflow when code lands on main, release branches, or tags are pushed. In that
@@ -26,9 +26,9 @@ description: >
   in `output/files-to-polish.txt`.
 ---
 
-# Release Notes & API Changelogs Skill
+# Release Notes & API Diffs Skill
 
-Generate SkiaSharp's website release notes **and** API changelogs as one coherent set.
+Generate SkiaSharp's website release notes **and** API diffs as one coherent set.
 
 This skill is used both by the `update-release-notes` agentic workflow (automatically
 on push to `main`, `release/*` branches, and tags) and manually when regenerating,
@@ -87,8 +87,8 @@ The flags narrow what it touches:
 
 | Invocation | What it regenerates |
 | --- | --- |
-| `generate.sh` (no args) | **Both** — the API changelogs **and** the release-notes pages, for every branch. *(The default, and what the workflow uses.)* |
-| `generate.sh --api-only` | Only the machine-generated **API-diff changelog** tree under `documentation/docfx/releases/`. |
+| `generate.sh` (no args) | **Both** — the API diffs **and** the release-notes pages, for every branch. *(The default, and what the workflow uses.)* |
+| `generate.sh --api-only` | Only the machine-generated **API-diff** tree under `documentation/docfx/releases/`. |
 | `generate.sh --notes-only` | Only the release-notes **pages'** raw-data blocks (+ `TOC.yml`/`index.md`). |
 | `generate.sh <scope args>` | Same as default but limited to the given scope, e.g. `--branch main`, `--branch release/4.147.0-preview.1`, or a version like `3.119.2`. |
 
@@ -256,7 +256,7 @@ Follow these rules:
 
 9. **Rollup at top** — Aggregate ALL changes across all previews into the main sections.
 
-10. **Previews are minimal** — One sentence + changelog link each, at the bottom.
+10. **Previews are minimal** — One sentence + Full Changelog link each, at the bottom.
     Render one trailing `## <label> (<date>)` section per entry in the data-block's
     `preview milestones` list (newest first), using that entry's compare link. Do not invent
     previews or dates — the list is authoritative (sourced from published prerelease tags).
diff --git a/.agents/skills/release-notes/scripts/generate.sh b/.agents/skills/release-notes/scripts/generate.sh
index 4b608a50a781..17ef716ecfa9 100755
--- a/.agents/skills/release-notes/scripts/generate.sh
+++ b/.agents/skills/release-notes/scripts/generate.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 #
 # generate.sh — the Prepare phase: run the two deterministic
-# release-notes/changelog generators in the required order (Cake -> Python),
+# release-notes/api diff generators in the required order (Cake -> Python),
 # VERBOSE, and write the "Files to polish" list to a file.
 #
 # Output contract (spec §2.2/§2.3): this script is VERBOSE. Cake and Python
@@ -22,9 +22,9 @@
 #   generate.sh [--api-only | --notes-only] [--polish-list <path>] \
 #               [extra args for the Python script...]
 #
-#   (no scope args)      Full regeneration of everything: API changelogs (Cake)
+#   (no scope args)      Full regeneration of everything: API diffs (Cake)
 #                        then release-notes raw data for every branch (Python --all).
-#   --api-only           Run only the Cake API-changelog generator.
+#   --api-only           Run only the Cake API-diff generator.
 #   --notes-only         Run only the Python release-notes generator.
 #   --polish-list <path> Forwarded to the Python generator: write the "Files to
 #                        polish" list to <path> instead of the default
@@ -42,6 +42,13 @@ set -euo pipefail
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 REPO_ROOT="$(git -C "$SCRIPT_DIR" rev-parse --show-toplevel)"
 
+# The two generation paths each have a single canonical script under
+# scripts/infra/docs/ that local runs, CI, and the docs Docker wrapper all share. This
+# orchestrator just calls them in the required order (Path 1 api diffs -> Path 2
+# notes); it owns no commands of its own so nothing can drift between here and CI.
+API_DIFFS_SH="$REPO_ROOT/scripts/infra/docs/generate-api-diffs.sh"
+RELEASE_NOTES_SH="$REPO_ROOT/scripts/infra/docs/generate-release-notes.sh"
+
 run_api=1
 run_notes=1
 polish_list=""
@@ -66,27 +73,16 @@ fi
 cd "$REPO_ROOT"
 
 if [ "$run_api" = 1 ]; then
-  if ! command -v dotnet >/dev/null 2>&1; then
-    echo "ERROR: the .NET SDK ('dotnet') is required for the API-changelog generator but was not found." >&2
-    echo "       Install the SDK pinned in global.json and retry, or pass --notes-only to skip it." >&2
-    exit 1
-  fi
-  echo "==> Prepare [1/2]: API changelogs (Cake: docs-api-diff-past) — verbose"
-  dotnet tool restore
-  dotnet cake --target=docs-api-diff-past --nugetDiffPrerelease=true
+  echo "==> Prepare [1/2]: API diffs (Path 1) — verbose"
+  "$API_DIFFS_SH"
 fi
 
 if [ "$run_notes" = 1 ]; then
-  if ! command -v python3 >/dev/null 2>&1; then
-    echo "ERROR: 'python3' is required for the release-notes generator but was not found." >&2
-    echo "       Install Python 3 and retry, or pass --api-only to skip it." >&2
-    exit 1
-  fi
   py_args=("${notes_args[@]}")
   if [ -n "$polish_list" ]; then
     py_args+=(--polish-list "$polish_list")
     echo "==> Files-to-polish list -> $polish_list"
   fi
-  echo "==> Prepare [2/2]: release-notes raw data (generate-release-notes.py ${py_args[*]}) — verbose"
-  python3 "$SCRIPT_DIR/generate-release-notes.py" "${py_args[@]}"
+  echo "==> Prepare [2/2]: release-notes raw data (Path 2) — verbose"
+  "$RELEASE_NOTES_SH" "${py_args[@]}"
 fi
diff --git a/.github/workflows/update-release-notes.lock.yml b/.github/workflows/update-release-notes.lock.yml
index a1c43edc68c2..caf11e97f5ce 100644
--- a/.github/workflows/update-release-notes.lock.yml
+++ b/.github/workflows/update-release-notes.lock.yml
@@ -1,4 +1,4 @@
-# gh-aw-metadata: {"schema_version":"v3","frontmatter_hash":"3eaf876b9b5bd7b32e15d5ff6c40caf4cc139291f823605d0631e9d03dee1576","compiler_version":"v0.71.5","strict":true,"agent_id":"copilot"}
+# gh-aw-metadata: {"schema_version":"v3","frontmatter_hash":"becc3eeab00de383b8093188cb20f6221fa2ddcb9eda056923f23cbab8aa88ee","compiler_version":"v0.71.5","strict":true,"agent_id":"copilot"}
 # gh-aw-manifest: {"version":1,"secrets":["COPILOT_GITHUB_TOKEN","GH_AW_CI_TRIGGER_TOKEN","GH_AW_GITHUB_MCP_SERVER_TOKEN","GH_AW_GITHUB_TOKEN","GITHUB_TOKEN"],"actions":[{"repo":"actions/checkout","sha":"de0fac2e4500dabe0009e67214ff5f5447ce83dd","version":"v6.0.2"},{"repo":"actions/download-artifact","sha":"3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c","version":"v8.0.1"},{"repo":"actions/github-script","sha":"373c709c69115d41ff229c7e5df9f8788daa9553","version":"v9"},{"repo":"actions/github-script","sha":"3a2844b7e9c422d3c10d287c895573f7108da1b3","version":"v9.0.0"},{"repo":"actions/setup-dotnet","sha":"67a3573c9a986a3f9c594539f4ab511d57bb3ce9","version":"67a3573c9a986a3f9c594539f4ab511d57bb3ce9"},{"repo":"actions/setup-node","sha":"48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e","version":"v6.4.0"},{"repo":"actions/upload-artifact","sha":"043fb46d1a93c77aae656e7c1c64a875d1fc6a0a","version":"v7.0.1"},{"repo":"github/gh-aw-actions/setup","sha":"b8068426813005612b960b5ab0b8bd2c27142323","version":"v0.71.5"}],"containers":[{"image":"ghcr.io/github/gh-aw-firewall/agent:0.25.40","digest":"sha256:14ff567e8d9d4c2fbc5e55c973488381c71d7e0fdbe72d30ee7b8a738fd86504","pinned_image":"ghcr.io/github/gh-aw-firewall/agent:0.25.40@sha256:14ff567e8d9d4c2fbc5e55c973488381c71d7e0fdbe72d30ee7b8a738fd86504"},{"image":"ghcr.io/github/gh-aw-firewall/api-proxy:0.25.40","digest":"sha256:2883ca3e5ae9f330cafdd9345bfd4ae17fc8da36c96d4c9a1f76e922b4c45280","pinned_image":"ghcr.io/github/gh-aw-firewall/api-proxy:0.25.40@sha256:2883ca3e5ae9f330cafdd9345bfd4ae17fc8da36c96d4c9a1f76e922b4c45280"},{"image":"ghcr.io/github/gh-aw-firewall/squid:0.25.40","digest":"sha256:b084f4a2c771f584ee68084ced52fa6b3245197a1889645d817462d307d3ac51","pinned_image":"ghcr.io/github/gh-aw-firewall/squid:0.25.40@sha256:b084f4a2c771f584ee68084ced52fa6b3245197a1889645d817462d307d3ac51"},{"image":"ghcr.io/github/gh-aw-mcpg:v0.3.6","digest":"sha256:2bb8eef86006a4c5963c55616a9c51c32f27bfdecb023b8aa6f91f6718d9171c","pinned_image":"ghcr.io/github/gh-aw-mcpg:v0.3.6@sha256:2bb8eef86006a4c5963c55616a9c51c32f27bfdecb023b8aa6f91f6718d9171c"},{"image":"ghcr.io/github/github-mcp-server:v1.0.3","digest":"sha256:2ac27ef03461ef2b877031b838a7d1fd7f12b12d4ace7796d8cad91446d55959","pinned_image":"ghcr.io/github/github-mcp-server:v1.0.3@sha256:2ac27ef03461ef2b877031b838a7d1fd7f12b12d4ace7796d8cad91446d55959"},{"image":"node:lts-alpine","digest":"sha256:d1b3b4da11eefd5941e7f0b9cf17783fc99d9c6fc34884a665f40a06dbdfc94f","pinned_image":"node:lts-alpine@sha256:d1b3b4da11eefd5941e7f0b9cf17783fc99d9c6fc34884a665f40a06dbdfc94f"}]}
 #    ___                   _   _      
 #   / _ \                 | | (_)     
@@ -22,7 +22,7 @@
 #
 # For more information: https://github.github.com/gh-aw/introduction/overview/
 #
-# Regenerate website release notes AND API changelogs when code lands on main, release branches, or tags — one pipeline, one PR.
+# Regenerate website release notes AND API diffs when code lands on main, release branches, or tags — one pipeline, one PR.
 #
 # Secrets used:
 #   - COPILOT_GITHUB_TOKEN
@@ -49,7 +49,7 @@
 #   - ghcr.io/github/github-mcp-server:v1.0.3@sha256:2ac27ef03461ef2b877031b838a7d1fd7f12b12d4ace7796d8cad91446d55959
 #   - node:lts-alpine@sha256:d1b3b4da11eefd5941e7f0b9cf17783fc99d9c6fc34884a665f40a06dbdfc94f
 
-name: "Update Release Notes & API Changelogs"
+name: "Update Release Notes & API Diffs"
 "on":
   push:
     branches:
@@ -72,6 +72,11 @@ name: "Update Release Notes & API Changelogs"
         description: Agent caller context (used internally by Agentic Workflows).
         required: false
         type: string
+      source_branch:
+        default: main
+        description: Branch to generate from (its scripts + content). Defaults to main; override on a manual run to validate a feature branch's pipeline before it merges.
+        required: false
+        type: string
 
 permissions: {}
 
@@ -79,7 +84,7 @@ concurrency:
   cancel-in-progress: true
   group: update-release-notes
 
-run-name: "Update Release Notes & API Changelogs"
+run-name: "Update Release Notes & API Diffs"
 
 jobs:
   activation:
@@ -107,7 +112,7 @@ jobs:
           job-name: ${{ github.job }}
           trace-id: ${{ needs.pre_activation.outputs.setup-trace-id }}
         env:
-          GH_AW_SETUP_WORKFLOW_NAME: "Update Release Notes & API Changelogs"
+          GH_AW_SETUP_WORKFLOW_NAME: "Update Release Notes & API Diffs"
           GH_AW_CURRENT_WORKFLOW_REF: ${{ github.repository }}/.github/workflows/update-release-notes.lock.yml@${{ github.ref }}
           GH_AW_INFO_VERSION: "1.0.40"
       - name: Generate agentic run info
@@ -119,7 +124,7 @@ jobs:
           GH_AW_INFO_VERSION: "1.0.40"
           GH_AW_INFO_AGENT_VERSION: "1.0.40"
           GH_AW_INFO_CLI_VERSION: "v0.71.5"
-          GH_AW_INFO_WORKFLOW_NAME: "Update Release Notes & API Changelogs"
+          GH_AW_INFO_WORKFLOW_NAME: "Update Release Notes & API Diffs"
           GH_AW_INFO_EXPERIMENTAL: "false"
           GH_AW_INFO_SUPPORTS_TOOLS_ALLOWLIST: "true"
           GH_AW_INFO_STAGED: "false"
@@ -200,23 +205,23 @@ jobs:
         run: |
           bash "${RUNNER_TEMP}/gh-aw/actions/create_prompt_first.sh"
           {
-          cat << 'GH_AW_PROMPT_517e56355342f3e5_EOF'
+          cat << 'GH_AW_PROMPT_aac4b46103079c7c_EOF'
           <system>
-          GH_AW_PROMPT_517e56355342f3e5_EOF
+          GH_AW_PROMPT_aac4b46103079c7c_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/xpia.md"
           cat "${RUNNER_TEMP}/gh-aw/prompts/temp_folder_prompt.md"
           cat "${RUNNER_TEMP}/gh-aw/prompts/markdown.md"
           cat "${RUNNER_TEMP}/gh-aw/prompts/safe_outputs_prompt.md"
-          cat << 'GH_AW_PROMPT_517e56355342f3e5_EOF'
+          cat << 'GH_AW_PROMPT_aac4b46103079c7c_EOF'
           <safe-output-tools>
           Tools: create_pull_request, missing_tool, missing_data, noop
-          GH_AW_PROMPT_517e56355342f3e5_EOF
+          GH_AW_PROMPT_aac4b46103079c7c_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/safe_outputs_create_pull_request.md"
-          cat << 'GH_AW_PROMPT_517e56355342f3e5_EOF'
+          cat << 'GH_AW_PROMPT_aac4b46103079c7c_EOF'
           </safe-output-tools>
-          GH_AW_PROMPT_517e56355342f3e5_EOF
+          GH_AW_PROMPT_aac4b46103079c7c_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/mcp_cli_tools_prompt.md"
-          cat << 'GH_AW_PROMPT_517e56355342f3e5_EOF'
+          cat << 'GH_AW_PROMPT_aac4b46103079c7c_EOF'
           <github-context>
           The following GitHub context information is available for this workflow:
           {{#if __GH_AW_GITHUB_ACTOR__ }}
@@ -248,12 +253,12 @@ jobs:
             - **Note**: If a branch you need is not in the list above and is not listed as an additional fetched ref, it has NOT been checked out. For private repositories you cannot fetch it without proper authentication. If the branch is required and not available, exit with an error and ask the user to add it to the `fetch:` option of the `checkout:` configuration (e.g., `fetch: ["refs/pulls/open/*"]` for all open PR refs, or `fetch: ["main", "feature/my-branch"]` for specific branches).
           </github-context>
           
-          GH_AW_PROMPT_517e56355342f3e5_EOF
+          GH_AW_PROMPT_aac4b46103079c7c_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          cat << 'GH_AW_PROMPT_517e56355342f3e5_EOF'
+          cat << 'GH_AW_PROMPT_aac4b46103079c7c_EOF'
           </system>
           {{#runtime-import .github/workflows/update-release-notes.md}}
-          GH_AW_PROMPT_517e56355342f3e5_EOF
+          GH_AW_PROMPT_aac4b46103079c7c_EOF
           } > "$GH_AW_PROMPT"
       - name: Interpolate variables and render templates
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
@@ -362,7 +367,7 @@ jobs:
           job-name: ${{ github.job }}
           trace-id: ${{ needs.activation.outputs.setup-trace-id }}
         env:
-          GH_AW_SETUP_WORKFLOW_NAME: "Update Release Notes & API Changelogs"
+          GH_AW_SETUP_WORKFLOW_NAME: "Update Release Notes & API Diffs"
           GH_AW_CURRENT_WORKFLOW_REF: ${{ github.repository }}/.github/workflows/update-release-notes.lock.yml@${{ github.ref }}
           GH_AW_INFO_VERSION: "1.0.40"
       - name: Set runtime paths
@@ -438,12 +443,10 @@ jobs:
           GH_AW_AGENT_FOLDERS: ".agents .claude .codex .crush .gemini .github .opencode .pi"
           GH_AW_AGENT_FILES: ".crush.json AGENTS.md CLAUDE.md GEMINI.md PI.md opencode.jsonc"
         run: bash "${RUNNER_TEMP}/gh-aw/actions/restore_base_github_folders.sh"
-      - name: Start from a clean main tree
-        run: |
-          set -euo pipefail
-          mkdir -p /tmp/gh-aw
-          git fetch origin main --quiet
-          git checkout -B main origin/main
+      - env:
+          SOURCE_BRANCH: ${{ inputs.source_branch || 'main' }}
+        name: Start from a clean source tree
+        run: "set -euo pipefail\nmkdir -p /tmp/gh-aw\n# Match the prepare job's source so its patch applies cleanly.\ngit fetch origin \"$SOURCE_BRANCH\" --quiet\ngit checkout -B \"$SOURCE_BRANCH\" \"origin/$SOURCE_BRANCH\"\n"
       - name: Download Prepare output
         uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
@@ -459,9 +462,9 @@ jobs:
           mkdir -p "${RUNNER_TEMP}/gh-aw/safeoutputs"
           mkdir -p /tmp/gh-aw/safeoutputs
           mkdir -p /tmp/gh-aw/mcp-logs/safeoutputs
-          cat > "${RUNNER_TEMP}/gh-aw/safeoutputs/config.json" << 'GH_AW_SAFE_OUTPUTS_CONFIG_d60e76d83ed18e47_EOF'
+          cat > "${RUNNER_TEMP}/gh-aw/safeoutputs/config.json" << 'GH_AW_SAFE_OUTPUTS_CONFIG_973dc004d7b5c857_EOF'
           {"create_pull_request":{"allowed_base_branches":["main"],"draft":false,"labels":["documentation"],"max":1,"max_patch_files":100,"max_patch_size":1024,"preserve_branch_name":true,"protect_top_level_dot_folders":true,"protected_files":["package.json","bun.lockb","bunfig.toml","deno.json","deno.jsonc","deno.lock","global.json","NuGet.Config","Directory.Packages.props","mix.exs","mix.lock","go.mod","go.sum","stack.yaml","stack.yaml.lock","pom.xml","build.gradle","build.gradle.kts","settings.gradle","settings.gradle.kts","gradle.properties","package-lock.json","yarn.lock","pnpm-lock.yaml","npm-shrinkwrap.json","requirements.txt","Pipfile","Pipfile.lock","pyproject.toml","setup.py","setup.cfg","Gemfile","Gemfile.lock","uv.lock","CODEOWNERS","DESIGN.md","README.md","CONTRIBUTING.md","CHANGELOG.md","SECURITY.md","CODE_OF_CONDUCT.md","AGENTS.md","CLAUDE.md","GEMINI.md"],"recreate_ref":true,"title_prefix":"[docs] "},"create_report_incomplete_issue":{},"missing_data":{},"missing_tool":{},"noop":{"max":1,"report-as-issue":"true"},"report_incomplete":{}}
-          GH_AW_SAFE_OUTPUTS_CONFIG_d60e76d83ed18e47_EOF
+          GH_AW_SAFE_OUTPUTS_CONFIG_973dc004d7b5c857_EOF
       - name: Generate Safe Outputs Tools
         env:
           GH_AW_TOOLS_META_JSON: |
@@ -669,7 +672,7 @@ jobs:
           
           mkdir -p /home/runner/.copilot
           GH_AW_NODE=$(which node 2>/dev/null || command -v node 2>/dev/null || echo node)
-          cat << GH_AW_MCP_CONFIG_8b89dca6360f0c05_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
+          cat << GH_AW_MCP_CONFIG_ee818d96a437ce29_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
           {
             "mcpServers": {
               "github": {
@@ -710,7 +713,7 @@ jobs:
               "payloadDir": "${MCP_GATEWAY_PAYLOAD_DIR}"
             }
           }
-          GH_AW_MCP_CONFIG_8b89dca6360f0c05_EOF
+          GH_AW_MCP_CONFIG_ee818d96a437ce29_EOF
       - name: Mount MCP servers as CLIs
         id: mount-mcp-clis
         continue-on-error: true
@@ -988,7 +991,7 @@ jobs:
           job-name: ${{ github.job }}
           trace-id: ${{ needs.activation.outputs.setup-trace-id }}
         env:
-          GH_AW_SETUP_WORKFLOW_NAME: "Update Release Notes & API Changelogs"
+          GH_AW_SETUP_WORKFLOW_NAME: "Update Release Notes & API Diffs"
           GH_AW_CURRENT_WORKFLOW_REF: ${{ github.repository }}/.github/workflows/update-release-notes.lock.yml@${{ github.ref }}
           GH_AW_INFO_VERSION: "1.0.40"
       - name: Download agent output artifact
@@ -1011,7 +1014,7 @@ jobs:
         env:
           GH_AW_AGENT_OUTPUT: ${{ steps.setup-agent-output-env.outputs.GH_AW_AGENT_OUTPUT }}
           GH_AW_NOOP_MAX: "1"
-          GH_AW_WORKFLOW_NAME: "Update Release Notes & API Changelogs"
+          GH_AW_WORKFLOW_NAME: "Update Release Notes & API Diffs"
           GH_AW_RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
           GH_AW_AGENT_CONCLUSION: ${{ needs.agent.result }}
           GH_AW_NOOP_REPORT_AS_ISSUE: "true"
@@ -1027,7 +1030,7 @@ jobs:
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         env:
           GH_AW_AGENT_OUTPUT: ${{ steps.setup-agent-output-env.outputs.GH_AW_AGENT_OUTPUT }}
-          GH_AW_WORKFLOW_NAME: "Update Release Notes & API Changelogs"
+          GH_AW_WORKFLOW_NAME: "Update Release Notes & API Diffs"
           GH_AW_RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
           GH_AW_DETECTION_CONCLUSION: ${{ needs.detection.outputs.detection_conclusion }}
           GH_AW_DETECTION_REASON: ${{ needs.detection.outputs.detection_reason }}
@@ -1044,7 +1047,7 @@ jobs:
         env:
           GH_AW_AGENT_OUTPUT: ${{ steps.setup-agent-output-env.outputs.GH_AW_AGENT_OUTPUT }}
           GH_AW_MISSING_TOOL_CREATE_ISSUE: "true"
-          GH_AW_WORKFLOW_NAME: "Update Release Notes & API Changelogs"
+          GH_AW_WORKFLOW_NAME: "Update Release Notes & API Diffs"
         with:
           github-token: ${{ secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
           script: |
@@ -1058,7 +1061,7 @@ jobs:
         env:
           GH_AW_AGENT_OUTPUT: ${{ steps.setup-agent-output-env.outputs.GH_AW_AGENT_OUTPUT }}
           GH_AW_REPORT_INCOMPLETE_CREATE_ISSUE: "true"
-          GH_AW_WORKFLOW_NAME: "Update Release Notes & API Changelogs"
+          GH_AW_WORKFLOW_NAME: "Update Release Notes & API Diffs"
         with:
           github-token: ${{ secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
           script: |
@@ -1072,7 +1075,7 @@ jobs:
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         env:
           GH_AW_AGENT_OUTPUT: ${{ steps.setup-agent-output-env.outputs.GH_AW_AGENT_OUTPUT }}
-          GH_AW_WORKFLOW_NAME: "Update Release Notes & API Changelogs"
+          GH_AW_WORKFLOW_NAME: "Update Release Notes & API Diffs"
           GH_AW_RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
           GH_AW_AGENT_CONCLUSION: ${{ needs.agent.result }}
           GH_AW_WORKFLOW_ID: "update-release-notes"
@@ -1124,7 +1127,7 @@ jobs:
           job-name: ${{ github.job }}
           trace-id: ${{ needs.activation.outputs.setup-trace-id }}
         env:
-          GH_AW_SETUP_WORKFLOW_NAME: "Update Release Notes & API Changelogs"
+          GH_AW_SETUP_WORKFLOW_NAME: "Update Release Notes & API Diffs"
           GH_AW_CURRENT_WORKFLOW_REF: ${{ github.repository }}/.github/workflows/update-release-notes.lock.yml@${{ github.ref }}
           GH_AW_INFO_VERSION: "1.0.40"
       - name: Download agent output artifact
@@ -1191,8 +1194,8 @@ jobs:
         if: always() && steps.detection_guard.outputs.run_detection == 'true'
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         env:
-          WORKFLOW_NAME: "Update Release Notes & API Changelogs"
-          WORKFLOW_DESCRIPTION: "Regenerate website release notes AND API changelogs when code lands on main, release branches, or tags — one pipeline, one PR."
+          WORKFLOW_NAME: "Update Release Notes & API Diffs"
+          WORKFLOW_DESCRIPTION: "Regenerate website release notes AND API diffs when code lands on main, release branches, or tags — one pipeline, one PR."
           HAS_PATCH: ${{ needs.agent.outputs.has_patch }}
         with:
           script: |
@@ -1305,7 +1308,7 @@ jobs:
           destination: ${{ runner.temp }}/gh-aw/actions
           job-name: ${{ github.job }}
         env:
-          GH_AW_SETUP_WORKFLOW_NAME: "Update Release Notes & API Changelogs"
+          GH_AW_SETUP_WORKFLOW_NAME: "Update Release Notes & API Diffs"
           GH_AW_CURRENT_WORKFLOW_REF: ${{ github.repository }}/.github/workflows/update-release-notes.lock.yml@${{ github.ref }}
           GH_AW_INFO_VERSION: "1.0.40"
       - name: Check team membership for workflow
@@ -1325,7 +1328,7 @@ jobs:
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         env:
           GH_AW_SKIP_BOTS: "github-actions,copilot,dependabot"
-          GH_AW_WORKFLOW_NAME: "Update Release Notes & API Changelogs"
+          GH_AW_WORKFLOW_NAME: "Update Release Notes & API Diffs"
         with:
           script: |
             const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
@@ -1334,7 +1337,7 @@ jobs:
             await main();
 
   prepare:
-    name: Prepare (changelogs + release-notes raw data)
+    name: Prepare (api diffs + release-notes raw data)
     needs: activation
     runs-on: ubuntu-latest
     permissions:
@@ -1366,13 +1369,17 @@ jobs:
                       /usr/share/swift /usr/share/dotnet/sdk 2>/dev/null || true
           sudo docker image prune --all --force 2>/dev/null || true
           echo "Disk after cleanup:"; df -h /
-      - name: Start from a clean main tree
+      - name: Start from a clean source tree
         run: |
           set -euo pipefail
-          # Release notes/changelogs always target main; a push to release/* is a
-          # content *source*, not the PR base, so generate from origin/main.
-          git fetch origin main --quiet
-          git checkout -B main origin/main
+          # Release notes/api diffs target main, so push/schedule runs always
+          # generate from main (a push to release/* is a content *source*, not the
+          # PR base). A manual dispatch may point SOURCE_BRANCH at a feature branch
+          # to validate its pipeline on CI before merge.
+          git fetch origin "$SOURCE_BRANCH" --quiet
+          git checkout -B "$SOURCE_BRANCH" "origin/$SOURCE_BRANCH"
+        env:
+          SOURCE_BRANCH: ${{ inputs.source_branch || 'main' }}
       - name: Setup .NET
         uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # 67a3573c9a986a3f9c594539f4ab511d57bb3ce9
         with:
@@ -1380,7 +1387,7 @@ jobs:
       - name: Generate (verbose)
         run: |
           set -euo pipefail
-          # Single entry point: Cake (API changelogs) then Python (raw data), both
+          # Single entry point: Cake (API diffs) then Python (raw data), both
           # VERBOSE. No args = --all; the "Files to polish" list lands at its
           # default location, output/files-to-polish.txt.
           bash .agents/skills/release-notes/scripts/generate.sh
@@ -1429,7 +1436,7 @@ jobs:
       GH_AW_ENGINE_MODEL: ${{ needs.agent.outputs.model }}
       GH_AW_ENGINE_VERSION: "1.0.40"
       GH_AW_WORKFLOW_ID: "update-release-notes"
-      GH_AW_WORKFLOW_NAME: "Update Release Notes & API Changelogs"
+      GH_AW_WORKFLOW_NAME: "Update Release Notes & API Diffs"
     outputs:
       code_push_failure_count: ${{ steps.process_safe_outputs.outputs.code_push_failure_count }}
       code_push_failure_errors: ${{ steps.process_safe_outputs.outputs.code_push_failure_errors }}
@@ -1448,7 +1455,7 @@ jobs:
           job-name: ${{ github.job }}
           trace-id: ${{ needs.activation.outputs.setup-trace-id }}
         env:
-          GH_AW_SETUP_WORKFLOW_NAME: "Update Release Notes & API Changelogs"
+          GH_AW_SETUP_WORKFLOW_NAME: "Update Release Notes & API Diffs"
           GH_AW_CURRENT_WORKFLOW_REF: ${{ github.repository }}/.github/workflows/update-release-notes.lock.yml@${{ github.ref }}
           GH_AW_INFO_VERSION: "1.0.40"
       - name: Download agent output artifact
diff --git a/.github/workflows/update-release-notes.md b/.github/workflows/update-release-notes.md
index fe62b6a03e54..6c80dcf6a133 100644
--- a/.github/workflows/update-release-notes.md
+++ b/.github/workflows/update-release-notes.md
@@ -1,5 +1,5 @@
 ---
-description: "Regenerate website release notes AND API changelogs when code lands on main, release branches, or tags — one pipeline, one PR."
+description: "Regenerate website release notes AND API diffs when code lands on main, release branches, or tags — one pipeline, one PR."
 on:
   push:
     branches: [main, "release/**"]
@@ -10,6 +10,12 @@ on:
     # Weekly safety net so a missed/failed push run still self-heals.
     - cron: "0 0 * * 0"
   workflow_dispatch:
+    inputs:
+      source_branch:
+        description: "Branch to generate from (its scripts + content). Defaults to main; override on a manual run to validate a feature branch's pipeline before it merges."
+        required: false
+        default: "main"
+        type: string
   skip-bots: [github-actions, copilot, dependabot]
 concurrency:
   group: update-release-notes
@@ -33,11 +39,11 @@ checkout:
 # its OWN job with its OWN timeout and a free-disk-space step, runs verbose (all
 # progress visible in the job log), and hands its result to the agent as an
 # artifact — a git patch of every working-tree change plus the files-to-polish
-# list. See documentation/dev/release-notes-and-changelogs.md §2.2/§2.3.
+# list. See documentation/dev/release-notes-and-api-diffs.md §2.2/§2.3.
 # ---------------------------------------------------------------------------
 jobs:
   prepare:
-    name: Prepare (changelogs + release-notes raw data)
+    name: Prepare (api diffs + release-notes raw data)
     runs-on: ubuntu-latest
     timeout-minutes: 120
     permissions:
@@ -58,13 +64,17 @@ jobs:
                       /usr/share/swift /usr/share/dotnet/sdk 2>/dev/null || true
           sudo docker image prune --all --force 2>/dev/null || true
           echo "Disk after cleanup:"; df -h /
-      - name: Start from a clean main tree
+      - name: Start from a clean source tree
+        env:
+          SOURCE_BRANCH: ${{ inputs.source_branch || 'main' }}
         run: |
           set -euo pipefail
-          # Release notes/changelogs always target main; a push to release/* is a
-          # content *source*, not the PR base, so generate from origin/main.
-          git fetch origin main --quiet
-          git checkout -B main origin/main
+          # Release notes/api diffs target main, so push/schedule runs always
+          # generate from main (a push to release/* is a content *source*, not the
+          # PR base). A manual dispatch may point SOURCE_BRANCH at a feature branch
+          # to validate its pipeline on CI before merge.
+          git fetch origin "$SOURCE_BRANCH" --quiet
+          git checkout -B "$SOURCE_BRANCH" "origin/$SOURCE_BRANCH"
       - name: Setup .NET
         uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
         with:
@@ -75,7 +85,7 @@ jobs:
           GITHUB_TOKEN: ${{ github.token }}
         run: |
           set -euo pipefail
-          # Single entry point: Cake (API changelogs) then Python (raw data), both
+          # Single entry point: Cake (API diffs) then Python (raw data), both
           # VERBOSE. No args = --all; the "Files to polish" list lands at its
           # default location, output/files-to-polish.txt.
           bash .agents/skills/release-notes/scripts/generate.sh
@@ -104,12 +114,15 @@ jobs:
 # These steps run in the agent job after its checkout and before the engine.
 # ---------------------------------------------------------------------------
 pre-agent-steps:
-  - name: Start from a clean main tree
+  - name: Start from a clean source tree
+    env:
+      SOURCE_BRANCH: ${{ inputs.source_branch || 'main' }}
     run: |
       set -euo pipefail
       mkdir -p /tmp/gh-aw
-      git fetch origin main --quiet
-      git checkout -B main origin/main
+      # Match the prepare job's source so its patch applies cleanly.
+      git fetch origin "$SOURCE_BRANCH" --quiet
+      git checkout -B "$SOURCE_BRANCH" "origin/$SOURCE_BRANCH"
   - name: Download Prepare output
     uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v4.1.8
     with:
@@ -146,10 +159,10 @@ safe-outputs:
     recreate-ref: true
 ---
 
-# Update Release Notes & API Changelogs
+# Update Release Notes & API Diffs
 
 This is the single pipeline that keeps the website release notes **and** the API
-changelogs current — there is no separate api-diff workflow. The deterministic
+api diffs current — there is no separate api-diff workflow. The deterministic
 generators run in a dedicated **`prepare`** job, the agent then polishes prose,
 and **one** pull request ships everything.
 
diff --git a/AGENTS.md b/AGENTS.md
index 8dbe75fbaed0..05f5c3a5b916 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -101,8 +101,8 @@ Single source of truth for all commands:
 | **Build C#** | `dotnet build binding/SkiaSharp/SkiaSharp.csproj` |
 | **Test** | `dotnet test tests/SkiaSharp.Tests.Console/SkiaSharp.Tests.Console.csproj` |
 | **Regenerate** | `pwsh ./utils/generate.ps1` |
-| **Diff branch for release notes** | `python3 .agents/skills/release-notes/scripts/generate-release-notes.py --branch main` |
-| **Update release notes TOC** | `python3 .agents/skills/release-notes/scripts/generate-release-notes.py --update-toc` |
+| **Diff branch for release notes** | `python3 scripts/infra/docs/generate-release-notes.py --branch main` |
+| **Update release notes TOC** | `python3 scripts/infra/docs/generate-release-notes.py --update-toc` |
 
 ### When to Use Which Bootstrap
 
@@ -359,7 +359,7 @@ Custom slash commands are available for specialized workflows. Use these for com
 | Test release (Step 3/4) | `/release-testing` | "test the release", "verify packages" |
 | Publish release (Step 4/4) | `/release-publish` | "push to nuget", "tag release" |
 | Release notes | `/release-notes` | "generate release notes", "regenerate 3.119.x", "write release notes for" |
-| Skia analyst | `/skia-analyst` | "what changed", "what are we missing", "feature gap", "changelog", "scout features", "diff tags" |
+| Skia analyst | `/skia-analyst` | "what changed", "what are we missing", "feature gap", "api diff", "scout features", "diff tags" |
 | Update Skia | `/update-skia` | "update to milestone NNN", "bump Skia" |
 | Review Skia update | `/review-skia-update` | "review the Skia merge PR" |
 | PR commit message | `/pr-commit-message` | "write commit message for PR" |
@@ -413,4 +413,4 @@ Work directly for:
 | Error Handling | `documentation/dev/error-handling.md` |
 | Debugging | `documentation/dev/debugging-methodology.md` |
 | NuGet Packages | `documentation/dev/packages.md` |
-| Release Notes & API Changelogs | `documentation/dev/release-notes-and-changelogs.md` |
+| Release Notes & API Diffs | `documentation/dev/release-notes-and-api-diffs.md` |
diff --git a/build.cake b/build.cake
index 98350ba9404c..89507d18584e 100644
--- a/build.cake
+++ b/build.cake
@@ -156,11 +156,11 @@ Task ("docs-download-output")
 
 Task ("docs-api-diff")
     .Description ("Generate API diffs.")
-    .Does (() => RunCake ("./.agents/skills/release-notes/scripts/api-diff.cake", "docs-api-diff"));
+    .Does (() => RunCake ("./scripts/infra/docs/api-diff.cake", "docs-api-diff"));
 
 Task ("docs-api-diff-past")
     .Description ("Generate historical API diffs.")
-    .Does (() => RunCake ("./.agents/skills/release-notes/scripts/api-diff.cake", "docs-api-diff-past"));
+    .Does (() => RunCake ("./scripts/infra/docs/api-diff.cake", "docs-api-diff-past"));
 
 Task ("docs-update-frameworks")
     .Description ("Update doc frameworks.")
diff --git a/documentation/dev/README.md b/documentation/dev/README.md
index aaaf71e544b2..501f747e61a6 100644
--- a/documentation/dev/README.md
+++ b/documentation/dev/README.md
@@ -40,6 +40,14 @@ C# Wrapper (binding/SkiaSharp/)  →  P/Invoke  →  C API (externals/skia/src/c
 | [writing-docs.md](writing-docs.md) | API documentation process |
 | [maintaining.md](maintaining.md) | Maintainer responsibilities |
 
+### Documentation system
+| Document | Description |
+|----------|-------------|
+| [docs-overview.md](docs-overview.md) | **Start here** — map of the whole docs system: the four artifacts, engines, skills, and cross-repo automation |
+| [writing-docs.md](writing-docs.md) | Operator how-to: generate & edit API docs and api diffs locally |
+| [release-notes-and-api-diffs.md](release-notes-and-api-diffs.md) | Behavior spec for the release-notes & API-diff engines |
+| [site.md](site.md) | Build, preview, and theme the conceptual docs website |
+
 ### Building
 | Document | Description |
 |----------|-------------|
diff --git a/documentation/dev/docs-overview.md b/documentation/dev/docs-overview.md
new file mode 100644
index 000000000000..06ad0a5550c9
--- /dev/null
+++ b/documentation/dev/docs-overview.md
@@ -0,0 +1,190 @@
+# SkiaSharp documentation — how the pieces fit together
+
+This is the **map** of SkiaSharp's documentation system: what gets generated, by
+which engine, driven by which skill, on which workflow, and in which repository.
+Start here for the big picture, then jump to a deep dive.
+
+## Start here — what are you trying to do?
+
+| If you want to… | Go to |
+|---|---|
+| **Understand the whole system** at a glance | This page (the map) — read on |
+| **Generate or edit docs by hand** — prerequisites, local commands, editing API docs, the Cake target reference | [writing-docs.md](writing-docs.md) |
+| **Change how release notes or API diffs behave** — the versioning model, `versions.json`, file layout, per-engine rules | [release-notes-and-api-diffs.md](release-notes-and-api-diffs.md) (the behavior **spec**; read before changing either generator) |
+| **Work on the docs website** — build, preview, theming | [site.md](site.md) |
+
+## Contents
+
+- [The four kinds of documentation](#the-four-kinds-of-documentation)
+- [Two repositories](#two-repositories)
+- [The engines (`scripts/infra/docs/`)](#the-engines-scriptsinfradocs)
+- [The skills](#the-skills)
+- [CI automation (cross-repo)](#ci-automation-cross-repo)
+- [Local generation & Docker](#local-generation--docker)
+- [Where to go next](#where-to-go-next)
+
+---
+
+## The four kinds of documentation
+
+SkiaSharp ships four distinct documentation artifacts. They are produced by
+different tools and live in different places, which is the main reason the system can
+feel sprawling — this table is the whole story on one screen:
+
+| # | Artifact | What it is | Source of truth | Engine |
+|---|----------|------------|-----------------|--------|
+| 1 | **Conceptual docs** | Hand-written guides & tutorials on the docs site | `documentation/conceptual/` (this repo) | docfx ([site.md](site.md)) |
+| 2 | **API reference docs** | Per-type/per-member XML reference (→ learn.microsoft.com) | `docs/SkiaSharpAPI/` (the **docs submodule**) | `docs.cake` (mdoc) |
+| 3 | **Release notes** | Human "what's new" pages, AI-polished | `documentation/docfx/releases/` (this repo) | `generate-release-notes.py` |
+| 4 | **API diffs** | Machine-generated public-API diffs, no AI | `documentation/docfx/releases/` (this repo) | `api-diff.cake` |
+
+Artifacts **3** and **4** share one versioning model and one config file
+(`versions.json`); that shared model is the subject of the
+[behavior spec](release-notes-and-api-diffs.md). Artifact **2** is a separate
+concern (mdoc), but it shares the same NuGet-diff plumbing
+(`api-diff-tools.cake`) and lives next to the others.
+
+---
+
+## Two repositories
+
+```mermaid
+flowchart LR
+  subgraph A["mono/SkiaSharp (this repo)"]
+    conceptual["documentation/conceptual/ — concept docs"]
+    releases["documentation/docfx/releases/ — release notes + API diffs"]
+    engines["scripts/infra/docs/ — the engines"]
+    submodule["docs/ (git submodule)"]
+  end
+  subgraph B["mono/SkiaSharp-API-docs (the docs repo)"]
+    xml["SkiaSharpAPI/ — mdoc XML reference docs"]
+  end
+  submodule -. "points at" .-> B
+  engines --> releases
+  engines -. "mdoc writes into" .-> xml
+```
+
+- **`mono/SkiaSharp`** (this repo) holds the conceptual docs, the release
+  notes/api diffs tree, and **all the generation engines**
+  (`scripts/infra/docs/`).
+- **`mono/SkiaSharp-API-docs`** (the *docs repo*) holds the large mdoc XML
+  reference docs and their images/examples. It is pulled into this repo as a git
+  **submodule** at `docs/`, so the XML lives at `docs/SkiaSharpAPI/`. The engines
+  in this repo run mdoc *into* that submodule.
+
+Because the engines live here but the XML output lives there, the API-reference
+path is inherently **cross-repo** — see the automation section below.
+
+---
+
+## The engines (`scripts/infra/docs/`)
+
+All generation code lives in one directory so local runs, CI, and the local Docker
+image all share exactly one copy and nothing can drift:
+
+| File | Role |
+|------|------|
+| `docs.cake` | mdoc-based XML reference-doc generator (artifact **2**) |
+| `api-diff.cake` | API-diff engine (artifact **4**) |
+| `generate-release-notes.py` | release-notes engine (artifact **3**) |
+| `api-diff-tools.cake` | shared NuGet-diff comparer + layout helpers, `#load`ed by both `api-diff.cake` and `docs.cake` |
+| `versions.json` | the **only** override surface — supersession + comparison baselines, honored identically by the Cake and Python engines |
+| `pr-authors.json` | PR-author cache for the release-notes engine |
+| `generate-api-diffs.sh` | **Path 1** runner → `cake docs-api-diff-past` |
+| `generate-release-notes.sh` | **Path 2** runner → `python generate-release-notes.py` |
+| `generate-api-docs.sh` | **Path 3** runner → `cake update-docs` (mdoc under mono) |
+| `docker/` | the local reproducibility image + `run.sh` wrapper |
+
+The three `generate-*.sh` scripts are the **single source of truth** for each path:
+a developer, the CI workflows, and the Docker wrapper all invoke the same script, so
+a command can never drift between local and CI. The shared, general-purpose Cake
+machinery (`shared.cake`, `download.cake`) stays under `scripts/infra/shared/`.
+
+### The three generation paths
+
+| Path | Produces | Entry script | Needs |
+|------|----------|--------------|-------|
+| **1 — API diffs** | artifact 4 | `generate-api-diffs.sh` | dotnet (+ NuGet feed) |
+| **2 — Release notes** | artifact 3 | `generate-release-notes.sh` | dotnet, python3, **git history**, **gh** (PR authors) |
+| **3 — API reference (mdoc)** | artifact 2 | `generate-api-docs.sh` | dotnet, **mono** (to run `mdoc.exe`) |
+
+`mdoc.exe` is a .NET Framework executable. `docs.cake` invokes it under **mono** when
+not on Windows, so Path 3 runs on any host with `mono-complete` installed — a Linux CI
+runner or the local Docker image, not only Windows.
+
+---
+
+## The skills
+
+Three Copilot skills drive or assist these paths (`.agents/skills/`):
+
+| Skill | Owns | Phase it performs |
+|-------|------|-------------------|
+| **`release-notes`** | artifacts 3 + 4 | Runs **Prepare** (the deterministic engines, via `scripts/generate.sh`) then **Polish** (AI rewrites only the prose of the listed release-notes pages). See spec §2.2/§4.4. |
+| **`api-docs`** | artifact 2 | Fills the `"To be added."` placeholders mdoc leaves in the XML with real prose, following the .NET doc guidelines. |
+| **`skia-analyst`** | analysis | Diffs versions / surfaces what changed and what's missing; used for release announcements and gap analysis, not for writing the committed artifacts. |
+
+The `release-notes` skill stays deliberately **thin**: its `scripts/generate.sh` owns
+no commands of its own — it just calls `generate-api-diffs.sh` then
+`generate-release-notes.sh` in order. All real logic lives in the engines under
+`scripts/infra/docs/`.
+
+---
+
+## CI automation (cross-repo)
+
+```mermaid
+flowchart TB
+  subgraph this["mono/SkiaSharp"]
+    urn["update-release-notes\n(ubuntu-latest)"]
+    sync["auto-docs-submodule-sync\n(ubuntu-latest)"]
+  end
+  subgraph docsrepo["mono/SkiaSharp-API-docs"]
+    writer["auto-api-docs-writer\n(Linux + mono)"]
+  end
+  urn -->|"Prepare engines 3+4,\nthen AI Polish → one PR"| prRel["PR: release notes + api diffs\n(this repo)"]
+  writer -->|"mdoc stubs +\nAI placeholder fill → PR"| prDocs["PR: XML docs\n(docs repo)"]
+  prDocs -->|"merged"| sync
+  sync -->|"bump docs/ submodule → PR"| prBump["PR: update submodule\n(this repo)"]
+```
+
+| Workflow | Repo | Runner | Produces | Paths |
+|----------|------|--------|----------|-------|
+| [`update-release-notes`](../../.github/workflows/update-release-notes.md) | this repo | `ubuntu-latest` (native dotnet + python) | one PR with release notes **and** API diffs | 1 + 2 |
+| `auto-api-docs-writer` | [docs repo](https://github.com/mono/SkiaSharp-API-docs/blob/main/.github/workflows/auto-api-docs-writer.md) | Linux + mono | PR with regenerated + AI-filled XML docs | 3 |
+| [`auto-docs-submodule-sync`](../../.github/workflows/auto-docs-submodule-sync.yml) | this repo | `ubuntu-latest` | PR bumping the `docs/` submodule pointer | — |
+
+Key points:
+
+| Point | What it means |
+|---|---|
+| **Paths 1 + 2 = one pipeline, one PR** | `update-release-notes` runs the deterministic Prepare phase (Cake API diffs + Python notes) in its own job, hands off to the AI Polish phase via an artifact, and opens a **single** rolling PR with both. Triggers: pushes to `main` and `release/*`, `v*` tags, and weekly. If nothing changed, **no PR is opened** (spec §2.3). |
+| **Path 3 is cross-repo** | The engines live in *this* repo but the XML lives in the *docs* repo, so `auto-api-docs-writer` lives in the docs repo, checks SkiaSharp out to borrow the engines, regenerates the stubs, AI-fills placeholders, and opens its PR there. |
+| **`auto-docs-submodule-sync` closes the loop** | Once the docs-repo PR merges, it bumps this repo's `docs/` submodule pointer so the new XML is picked up here. |
+
+---
+
+## Local generation & Docker
+
+Everything CI does can be reproduced locally by calling the **same**
+`generate-*.sh` scripts. The only host requirement beyond the .NET SDK is **mono**
+for Path 3, and **gh** for Path 2's PR-author lookup.
+
+| Mode | What it is | When to use |
+|---|---|---|
+| **Native** | Install the deps yourself and call the `generate-*.sh` scripts (or the underlying Cake targets in [writing-docs.md](writing-docs.md)). | When you've installed the deps yourself. |
+| **Docker** (`scripts/infra/docs/docker/run.sh`) | A **local-only** convenience image that pre-installs dotnet + mono + python + gh and runs the same scripts against a bind-mounted checkout, so a local run reproduces what CI produces. | A one-command reproducible run without installing the deps yourself. |
+
+> **Docker is for local reproducibility only — CI does not use it.** The CI runners
+> install the same dependencies natively on Linux and call the same scripts. The image
+> simply mirrors that dependency surface so the two stay identical.
+
+---
+
+## Where to go next
+
+- Generating or editing docs by hand → **[writing-docs.md](writing-docs.md)**
+- Changing how release notes or API diffs behave →
+  **[release-notes-and-api-diffs.md](release-notes-and-api-diffs.md)** (change the
+  spec first, then the code)
+- The docs **website** (concept docs, theming, preview) → **[site.md](site.md)**
diff --git a/documentation/dev/maintaining.md b/documentation/dev/maintaining.md
index 61b06b751a9f..5ab00273d823 100644
--- a/documentation/dev/maintaining.md
+++ b/documentation/dev/maintaining.md
@@ -98,7 +98,7 @@ Updating native Skia is usually manageable, though it can become tricky when the
 
 ### General Update Steps
 
-1. Review the upstream changelog for breaking changes.
+1. Review the upstream api diff for breaking changes.
 2. Merge the target Skia version into a new branch from our current version.
 3. Resolve any merge conflicts and get it compiling.
 4. Identify and adapt to any changed or removed features.
@@ -122,7 +122,7 @@ Once native Skia is updated, updating SkiaSharp is typically more straightforwar
 1. Finish updating native Skia.
 2. Update or rewrite .NET methods to match the new native APIs.
 3. Add tests for everything.
-4. Add more tests based on things in the changelog or new features.
+4. Add more tests based on things in the api diff or new features.
 
 We’re selective about which new native APIs to expose right away. Google iterates quickly, and early-stage APIs may be short-lived or evolve significantly. Lagging slightly behind can actually help — by the time we adopt a new feature, it’s often more stable.
 
diff --git a/documentation/dev/release-notes-and-changelogs.md b/documentation/dev/release-notes-and-api-diffs.md
similarity index 68%
rename from documentation/dev/release-notes-and-changelogs.md
rename to documentation/dev/release-notes-and-api-diffs.md
index 578ecfc8c15e..7c418af41cec 100644
--- a/documentation/dev/release-notes-and-changelogs.md
+++ b/documentation/dev/release-notes-and-api-diffs.md
@@ -1,4 +1,4 @@
-# Release notes & API changelogs — behavior spec
+# Release notes & API diffs — behavior spec
 
 > **READ THIS FIRST before editing any generator.** This document is the
 > *specification*; the Python script, the Cake script, and the workflow are just its
@@ -16,12 +16,17 @@ SkiaSharp generates two version-indexed artifacts from one shared versioning mod
 
 - **Release notes** — human-readable "what's new" pages, generated by
   `generate-release-notes.py` (Python) from git history, then AI-polished for prose.
-- **API changelogs** — machine-generated public-API diffs, generated by
+- **API diffs** — machine-generated public-API diffs, generated by
   `api-diff.cake` (Cake) from the published NuGet feed; no AI.
 
 Both live in the docfx site under `documentation/docfx/releases/` (§3) and are
 produced by one self-contained skill (§2). A full feature comparison is in §6.
 
+> **Looking for the big picture instead of the rules?** This document is the deep
+> behavior spec. For a one-screen map of the *whole* documentation system — all four
+> artifacts, the engines, the skills, and the cross-repo CI — start at
+> [docs-overview.md](docs-overview.md).
+
 Both are **agent/CI tooling, not human-facing CLIs.** They take no "fancy" toggles.
 They always regenerate the complete set and rely on being idempotent (unchanged
 outputs are skipped or rewritten identically). If you find yourself adding a flag
@@ -30,6 +35,44 @@ thing.
 
 ---
 
+## Contents
+
+- **§1 — The shared versioning model (the rules)**
+  - §1.1 One artifact per release *line*, keyed by the version core
+  - §1.2 `versions.json` — the only override surface
+  - §1.3 Default comparison: the previous emitted line
+  - §1.4 Which lines get an artifact (emission)
+  - §1.5 Two parallel version families (SkiaSharp & HarfBuzzSharp)
+- **§2 — Skill layout & orchestration**
+  - §2.1 Engines live in `scripts/infra/docs/`; the skill just calls them
+  - §2.2 Two phases: Prepare → Polish
+  - §2.3 One workflow, one PR
+- **§3 — Filesystem layout & naming (canonical)**
+  - §3.1 The `releases/` tree at a glance
+  - §3.2 Human pages (release-notes engine owns)
+  - §3.3 API-diff folders (API-diff engine owns)
+  - §3.4 The HarfBuzz tree shape
+  - §3.5 Ownership — who writes and clears what
+  - §3.6 The co-release map sidecar (Cake → Python)
+- **§4 — Release-notes engine (`generate-release-notes.py`)**
+  - §4.1 Inputs & outputs
+  - §4.2 Released vs unreleased — two coexisting pages
+  - §4.3 Per-preview PR buckets
+  - §4.4 Division of responsibility — the script structures, the AI only polishes
+  - §4.5 The HarfBuzz family pages
+  - §4.6 How it runs
+- **§5 — API-diff engine (`api-diff.cake`)**
+  - §5.1 Inputs & outputs
+  - §5.2 Behavior
+  - §5.3 The "current" CI variant
+  - §5.4 How it runs
+- **§6 — Differences at a glance**
+- **§7 — Editing rules**
+  - §7.1 Editing this spec
+  - §7.2 Behavioral invariants the code must uphold
+
+---
+
 ## 1. The shared versioning model (the rules)
 
 This is the hard-won core. Both engines implement exactly these rules; they differ
@@ -142,7 +185,7 @@ share the resulting line set** for that family:
   stable" exactly like rule 3; its version is read from source (§5.1) and it emits an
   in-flight page (§4.5).
 
-Within each family the release-notes page set and the API-changelog line set therefore
+Within each family the release-notes page set and the API-diff line set therefore
 cover exactly the same lines.
 
 ### 1.5 Two parallel version families (SkiaSharp & HarfBuzzSharp)
@@ -152,85 +195,111 @@ carry **different version numbers** (SkiaSharp `3.119.0`, HarfBuzz `8.3.0`). Rat
 than fold one into the other, each **family** keeps its own identity and applies the
 §1.1–§1.4 rules independently:
 
-- **Family = the package's own version scheme.** *Every* `SkiaSharp.*` package
-  belongs to the **SkiaSharp** family — `SkiaSharp`, `SkiaSharp.Views.*`,
-  `SkiaSharp.Skottie`, …, and crucially `SkiaSharp.HarfBuzz` (the *managed shaper
-  binding*, which carries the SkiaSharp version, **not** a HarfBuzz version). The
-  **HarfBuzz** family is *only* the HarfBuzzSharp-versioned packages: `HarfBuzzSharp`
-  (the native binding) and `HarfBuzzSharp.NativeAssets.*`.
-- **Both families are first-class and identical in structure.** Each applies §1.1–§1.4
-  entirely within its own version scheme: the same emission rules (§1.4), the same
-  previous-emitted-line baselines (§1.3) and `versions.json` bucket (§1.2), the same
-  human release-notes pages (§4) **and** API changelogs (§5), and the same
-  released/unreleased split, preview buckets, supersession, and AI polish. Neither is
-  folded into or subordinate to the other, and there are **no cross-family baselines**.
-  SkiaSharp lives at the `releases/` root and HarfBuzz under `releases/harfbuzzsharp/`
-  (§3) — identical shapes, one level deeper.
-- **The one difference: HarfBuzz is processed through SkiaSharp's branches and tags.**
-  HarfBuzz never releases on its own — every HarfBuzz version ships *inside* a SkiaSharp
-  release (usually via a *Bump HarfBuzz* PR), so it has no `release/*` branches or `v*`
-  tags of its own. So everything the engines otherwise read from a family's own git refs
-  — commit ranges, preview-milestone boundaries, release dates — the HarfBuzz family
-  takes from the **SkiaSharp** refs of its co-shipping release (via the co-release map
-  below), then **filters the commits to HarfBuzz-owned files** so the page shows
-  HarfBuzz's own changes instead of SkiaSharp's. That commit filter is the *only* content
-  difference; the engine mechanics are in §4.5. Specifically:
-  - **HarfBuzz-owned files** are the HarfBuzz packages, native build, and tests — **never**
-    any `SkiaSharp.*` source (`SkiaSharp.HarfBuzz` is SkiaSharp-versioned and stays on the
-    SkiaSharp page). §4.5 holds the canonical path list.
-  - A PR that touches *both* families appears on *both* pages — that duplication is
-    intended.
-  - Every HarfBuzz line gets a page (a published line beside its API-diff folder, §3.4; an
-    in-flight line without one yet, §4.5); when a line's filtered commit set is empty the
-    generator writes a deterministic **No changes** page (§4.5), so the page set still
-    equals the line set.
-- **The co-release map is the bridge** (deterministic, script-owned). The exact HarfBuzz
-  version that ships with SkiaSharp line *L* is read from `SkiaSharp.HarfBuzz@L`'s
-  `HarfBuzzSharp` package dependency (e.g. `SkiaSharp.HarfBuzz 2.88.0 → HarfBuzzSharp
-  2.8.2`) — from the published package for an emitted SkiaSharp line, or from the **working
-  tree** for an in-flight line not yet on the feed (§5.1) — kept at **full §1.1 line
-  granularity** so it names a real HarfBuzz line/folder (never truncated to
-  `Major.Minor.Patch`). The Cake engine — which already reads the packages — records this
-  `L ↔ hb` mapping in the **co-release map sidecar** (§3.6); the Python engine consumes it
-  both ways (§4.5): to give each HarfBuzz line its SkiaSharp git range, and to cross-link
-  the SkiaSharp and HarfBuzz hub pages (§4.4). When a single HarfBuzz line ships across
-  several SkiaSharp lines, the **earliest (introducing)** one — whose *Bump HarfBuzz* PR
-  created the line — is its canonical co-ship release: the one its banner and back-link
-  name (§4.4/§4.5). A HarfBuzz dependency of a *published* SkiaSharp line always resolves
-  to a released HarfBuzz folder; an in-flight line may name an as-yet-unpublished HarfBuzz
-  line, which emits an in-flight page (§4.5) rather than a folder. The mapping is **never**
-  computed by the AI.
+#### Family = the package's own version scheme
+
+*Every* `SkiaSharp.*` package belongs to the **SkiaSharp** family — `SkiaSharp`,
+`SkiaSharp.Views.*`, `SkiaSharp.Skottie`, …, and crucially `SkiaSharp.HarfBuzz` (the
+*managed shaper binding*, which carries the SkiaSharp version, **not** a HarfBuzz
+version). The **HarfBuzz** family is *only* the HarfBuzzSharp-versioned packages:
+`HarfBuzzSharp` (the native binding) and `HarfBuzzSharp.NativeAssets.*`.
+
+#### Both families are first-class and identical in structure
+
+Each applies §1.1–§1.4 entirely within its own version scheme: the same emission rules
+(§1.4), the same previous-emitted-line baselines (§1.3) and `versions.json` bucket
+(§1.2), the same human release-notes pages (§4) **and** API diffs (§5), and the same
+released/unreleased split, preview buckets, supersession, and AI polish. Neither is
+folded into or subordinate to the other, and there are **no cross-family baselines**.
+SkiaSharp lives at the `releases/` root and HarfBuzz under `releases/harfbuzzsharp/`
+(§3) — identical shapes, one level deeper.
+
+#### The one difference: HarfBuzz is processed through SkiaSharp's branches and tags
+
+HarfBuzz never releases on its own — every HarfBuzz version ships *inside* a SkiaSharp
+release (usually via a *Bump HarfBuzz* PR), so it has no `release/*` branches or `v*`
+tags of its own. So everything the engines otherwise read from a family's own git refs
+— commit ranges, preview-milestone boundaries, release dates — the HarfBuzz family
+takes from the **SkiaSharp** refs of its co-shipping release (via the co-release map
+below), then **filters the commits to HarfBuzz-owned files** so the page shows
+HarfBuzz's own changes instead of SkiaSharp's. That commit filter is the *only* content
+difference; the engine mechanics are in §4.5. Specifically:
+
+- **HarfBuzz-owned files** are the HarfBuzz packages, native build, and tests — **never**
+  any `SkiaSharp.*` source (`SkiaSharp.HarfBuzz` is SkiaSharp-versioned and stays on the
+  SkiaSharp page). §4.5 holds the canonical path list.
+- A PR that touches *both* families appears on *both* pages — that duplication is
+  intended.
+- Every HarfBuzz line gets a page (a published line beside its API-diff folder, §3.4; an
+  in-flight line without one yet, §4.5); when a line's filtered commit set is empty the
+  generator writes a deterministic **No changes** page (§4.5), so the page set still
+  equals the line set.
+
+#### The co-release map is the bridge
+
+The bridge is deterministic and script-owned. The exact HarfBuzz version that ships with
+SkiaSharp line *L* is read from `SkiaSharp.HarfBuzz@L`'s `HarfBuzzSharp` package
+dependency (e.g. `SkiaSharp.HarfBuzz 2.88.0 → HarfBuzzSharp 2.8.2`) — from the published
+package for an emitted SkiaSharp line, or from the **working tree** for an in-flight line
+not yet on the feed (§5.1) — kept at **full §1.1 line granularity** so it names a real
+HarfBuzz line/folder (never truncated to `Major.Minor.Patch`). The Cake engine — which
+already reads the packages — records this `L ↔ hb` mapping in the **co-release map
+sidecar** (§3.6); the Python engine consumes it both ways (§4.5): to give each HarfBuzz
+line its SkiaSharp git range, and to cross-link the SkiaSharp and HarfBuzz hub pages
+(§4.4). When a single HarfBuzz line ships across several SkiaSharp lines, the **earliest
+(introducing)** one — whose *Bump HarfBuzz* PR created the line — is its canonical
+co-ship release: the one its banner and back-link name (§4.4/§4.5). A HarfBuzz dependency
+of a *published* SkiaSharp line always resolves to a released HarfBuzz folder; an
+in-flight line may name an as-yet-unpublished HarfBuzz line, which emits an in-flight page
+(§4.5) rather than a folder. The mapping is **never** computed by the AI.
 
 ---
 
 ## 2. Skill layout & orchestration
 
-### 2.1 One self-contained skill owns both generators
+### 2.1 Engines live in `scripts/infra/docs/`; the skill just calls them
+
+All the doc-generation engines and their per-path runner scripts live together under
+`scripts/infra/docs/`, so local runs, CI, and the docs Docker image all share one copy
+and nothing can drift:
 
-Both generators live together in the release-notes skill so the skill is
-self-contained and the targets reflect the docs they produce:
+```
+scripts/infra/docs/
+  api-diff.cake                API-diff engine (§5)
+  generate-release-notes.py    release-notes engine (§4)
+  api-diff-tools.cake          shared NuGet-diff comparer + layout helpers (§5),
+                               #loaded by api-diff.cake AND docs.cake
+  docs.cake                    mdoc-based docs/ XML generators (a different concern)
+  generate-api-diffs.sh       Path 1 runner: cake docs-api-diff-past
+  generate-release-notes.sh    Path 2 runner: python generate-release-notes.py
+  generate-api-docs.sh         Path 3 runner: cake update-docs (mdoc under mono)
+  versions.json                supersession + baseline config (§1), used by both engines
+  pr-authors.json              PR-author cache for the release-notes engine (§4)
+  docker/                      reproducible image + run.sh wrapper for every path
+```
+
+The release-notes **skill** stays thin: it owns only the AI polish instructions and a
+single orchestrator that calls the runner scripts in order, so the skill never has to
+know the individual commands:
 
 ```
 .agents/skills/release-notes/
   SKILL.md                       the AI's polish-only instructions (§4.4)
   scripts/
-    generate.sh                  wrapper: runs the two generators in order, verbose,
+    generate.sh                  wrapper: runs Path 1 then Path 2 in order, verbose,
                                  and writes the Files-to-polish list to a file (§2.2)
-    generate-release-notes.py    release-notes engine (§4)
-    api-diff.cake                API-changelog engine (§5)
 ```
 
-Reusable Cake machinery (the NuGet-diff comparer factory, the breaking/full-diff
-runner, the markdown copier), the package tables (`TRACKED_NUGETS`, §5.1), and
-`versions.json` loading live under `scripts/infra/shared/` and are `#load`ed by
-`api-diff.cake`. The skill **uses** shared infra but **owns** the API-diff target
-definitions.[^mdoc]
+`generate.sh` owns no commands of its own — it delegates to
+`scripts/infra/docs/generate-api-diffs.sh` then `…/generate-release-notes.sh` — so the
+skill, the update-release-notes workflow, the Docker wrapper, and a human running it by
+hand all execute the exact same code.
 
-[^mdoc]: The mdoc-based `docs/` XML generators (`docs-update-frameworks`,
-`docs-format-docs`) are a *different* concern and stay in
-`scripts/infra/docs/docs.cake`. They share only the NuGet-diff comparer factory,
-which is why that one helper lives in `shared/` rather than next to the API-diff
-target.
+The general-purpose Cake machinery (`shared.cake`, `download.cake`) stays under
+`scripts/infra/shared/` and is `#load`ed by the engines. `api-diff-tools.cake` (the
+NuGet-diff comparer factory, the breaking/full-diff runner, and `versions.json` loading)
+is used by *only* the two doc engines (`api-diff.cake` and the mdoc generators in
+`docs.cake`), so it sits next to them in `scripts/infra/docs/` rather than under
+`shared/`.
 
 ### 2.2 Two phases: Prepare → Polish
 
@@ -350,7 +419,7 @@ root; the HarfBuzz family lives under `releases/harfbuzzsharp/` with the same sh
   folder (§3.3) coexists beside it, so adding API diffs requires **no rename** of
   existing pages and **no TOC href churn**. The HarfBuzz tree mirrors this exactly.
 
-### 3.3 API-diff folders (API-changelog engine owns)
+### 3.3 API-diff folders (API-diff engine owns)
 
 One folder per emitted line, named by the §1.1 core, holding **package-namespaced,
 per-assembly** diffs:
@@ -412,18 +481,24 @@ paths and only ever clears its own:
 | `releases/co-release-map.json` (§3.6) | Cake | Cake (rewritten each run) |
 
 The Cake engine clears **only the generated API-diff files** it owns. A file is treated
-as generated — and therefore deleted before the rebuild — only when **both**: (1) its
-first line starts with the `# API diff:` marker, and (2) it is not a `*.humanreadable.md`
-file. Condition (1) distinguishes a generated `<assembly>.md` from a hand-authored file
-shaped like one (e.g. `1.68.0/SkiaSharp/gpu-migration.md`), which a plain `*.md` glob
-could not. Condition (2) leaves the retired legacy `*.humanreadable.md` format untouched
-(and treats all such files consistently regardless of whether they happen to carry the
-marker). **Hand-authored files nested inside a `<line>/` folder are therefore preserved**;
-the human pages at the `releases/` root are never touched. Empty directories are pruned
-after deletion. The deterministic page→folder links are written by the Python engine
-(§2.2), not the AI.
-
-**TOC / index representation.** `TOC.yml` groups SkiaSharp lines into `Version X.Y.x`
+as generated — and therefore deleted before the rebuild — only when **both** of these
+hold:
+
+1. Its first line starts with the `# API diff:` marker. This distinguishes a generated
+   `<assembly>.md` from a hand-authored file shaped like one (e.g.
+   `1.68.0/SkiaSharp/gpu-migration.md`), which a plain `*.md` glob could not.
+2. It is **not** a `*.humanreadable.md` file. This leaves the retired legacy
+   `*.humanreadable.md` format untouched (and treats all such files consistently
+   regardless of whether they happen to carry the marker).
+
+So **hand-authored files nested inside a `<line>/` folder are preserved**, and the human
+pages at the `releases/` root are never touched. Empty directories are pruned after
+deletion. The deterministic page→folder links are written by the Python engine (§2.2),
+not the AI.
+
+#### TOC / index representation
+
+`TOC.yml` groups SkiaSharp lines into `Version X.Y.x`
 minor nodes (each nesting its patch releases), plus a **HarfBuzz** section that mirrors
 the same shape — `HarfBuzzSharp X.Y.x` minor subgroups, each nesting its emitted HarfBuzz
 lines pointing at their `harfbuzzsharp/<hb-line>.md` hubs (an intentional navigation
@@ -443,10 +518,12 @@ is one click to the line's diff index and one more to a specific assembly. `inde
 deterministic SkiaSharp↔HarfBuzz mapping across the engine boundary. It is **written by
 Cake** (which already reads the package dependencies) and **read by Python** (which
 writes the page→folder link). It is *not* a rendered page (no `.md`), it is not edited
-by the AI, and it is the **only** thing that crosses from the API-changelog engine into
+by the AI, and it is the **only** thing that crosses from the API-diff engine into
 the release-notes engine.
 
-Shape — **one entry per emitted SkiaSharp line** (including in-flight lines), each mapping
+#### Shape
+
+**One entry per emitted SkiaSharp line** (including in-flight lines), each mapping
 that SkiaSharp line to the single HarfBuzz line it ships:
 
 ```json
@@ -456,6 +533,8 @@ that SkiaSharp line to the single HarfBuzz line it ships:
 ]
 ```
 
+#### Field meanings
+
 - **`hb_line` is authoritative.** It is the HarfBuzz family line at **full §1.1 granularity**
   (never truncated to `Major.Minor.Patch`, so a 4-part stable like `8.3.1.5` is preserved).
   Python derives everything else from it: the API-diff index path
@@ -467,6 +546,8 @@ that SkiaSharp line to the single HarfBuzz line it ships:
   previews is attributed to that line's final HarfBuzz version; the map records no
   finer-grained history.
 
+#### How Python consumes it
+
 Python consumes the map **both ways** (§1.5/§4.5): it groups `skia_line`s by `hb_line` to
 give each HarfBuzz line its SkiaSharp git range and its canonical (earliest) co-ship release,
 and it cross-links the SkiaSharp and HarfBuzz hub pages. A `hb_line` of a *published*
@@ -538,32 +619,40 @@ unreleased delta, a plain stable patch) carry one flat list instead.
 
 ### 4.4 Division of responsibility — the script structures, the AI only polishes
 
-**The scripts own everything structural and deterministic:** every filename, diff
-range, released-vs-unreleased split, rollup-vs-delta, supersession banner, preview
-bucketing, stale-page pruning, and **all links** (including the §1.5 HarfBuzz
-page→folder link). **The AI/skill only rewrites prose** in the files the script lists
-under "Files to polish". The AI never creates, renames, or deletes pages, never writes
-structural content or links, never edits either script, and — on any anomaly (a
-missing/unexpected page, data that looks wrong) — **stops and reports** instead of
-working around it. A maintainer then fixes the *script* (and this spec), never the
-output. See `.agents/skills/release-notes/SKILL.md`.
+**Division of responsibility:**
+
+| Owner | Responsibility |
+|---|---|
+| **Scripts** | Everything structural and deterministic: every filename, diff range, released-vs-unreleased split, rollup-vs-delta, supersession banner, preview bucketing, stale-page pruning, and **all links** (including the §1.5 HarfBuzz page→folder link). |
+| **AI / skill** | Only rewrites **prose** in the files the script lists under "Files to polish". Never creates, renames, or deletes pages; never writes structural content or links; never edits either script. On any anomaly (a missing/unexpected page, data that looks wrong) it **stops and reports** instead of working around it. |
+
+A maintainer then fixes the *script* (and this spec), never the output. See
+`.agents/skills/release-notes/SKILL.md`.
+
+#### API-diff link rule
 
 **The API-diff links are required, fixed, and non-AI.** Every emitted page **whose line has
 an API-diff folder** carries the script-owned `> **API changes** · …` line in its
-**structural header** (above the prose region). On a **SkiaSharp** page it points at this
-line's `<line>/index.md` (§3.3) and, when HarfBuzz co-ships, at the co-shipped **HarfBuzz
-hub page** `harfbuzzsharp/<hb-line>.md` (§1.5/§3.6) — which carries HarfBuzz's own notes and
-its own API-diff link. On a **HarfBuzz** page it points at this HarfBuzz line's
-`harfbuzzsharp/<hb-line>/index.md` (§3.4) and back at its **canonical (introducing) SkiaSharp
-release** (§1.5). A page with **no** API-diff folder — typically an `-unreleased` head delta,
-whose commits are not yet in any published line's folder — carries **no** such line; the
-folder's presence drives the link, and the link's presence is part of the content key (§4.6),
-so it is backfilled the moment a folder appears. The line is **identical in presence and
-ownership** on every page (always script-owned, never AI-authored); its two *targets* differ
-by family per the rules above. The AI does **not** decide whether to include it, where to put
-it, how to word it, or what it links to, and does **not** narrate around it: it preserves any
-such line **verbatim** and writes no API-diff or cross-family links of its own. "Just link" —
-the diff itself is the artifact (§5.4); the page only points at it.
+**structural header** (above the prose region).
+
+- On a **SkiaSharp** page it points at this line's `<line>/index.md` (§3.3) and, when
+  HarfBuzz co-ships, at the co-shipped **HarfBuzz hub page** `harfbuzzsharp/<hb-line>.md`
+  (§1.5/§3.6) — which carries HarfBuzz's own notes and its own API-diff link.
+- On a **HarfBuzz** page it points at this HarfBuzz line's
+  `harfbuzzsharp/<hb-line>/index.md` (§3.4) and back at its **canonical (introducing)
+  SkiaSharp release** (§1.5).
+
+A page with **no** API-diff folder — typically an `-unreleased` head delta, whose commits
+are not yet in any published line's folder — carries **no** such line; the folder's
+presence drives the link, and the link's presence is part of the content key (§4.6), so it
+is backfilled the moment a folder appears.
+
+The line is **identical in presence and ownership** on every page (always script-owned,
+never AI-authored); its two *targets* differ by family per the rules above. The AI does
+**not** decide whether to include it, where to put it, how to word it, or what it links to,
+and does **not** narrate around it: it preserves any such line **verbatim** and writes no
+API-diff or cross-family links of its own. "Just link" — the diff itself is the artifact
+(§5.4); the page only points at it.
 
 ### 4.5 The HarfBuzz family pages
 
@@ -641,7 +730,7 @@ opens no PR (§2.3).
 
 ---
 
-## 5. API-changelog engine (`api-diff.cake`)
+## 5. API-diff engine (`api-diff.cake`)
 
 ### 5.1 Inputs & outputs
 
@@ -667,22 +756,54 @@ emit exactly the lines §1.4 selects, and diff each emitted line against its bas
 (§1.2/§1.3). A line's *representative* package is the newest stable if it shipped,
 otherwise the newest prerelease.
 
-**Deterministic resolution.** The comparer must resolve *every* referenced assembly: an
-unresolved reference makes `Mono.ApiTools` silently degrade type matching into spurious "New
-Type" dumps whose shape depends on what is installed on the build host, so the output stops
-being deterministic. `CreateNuGetDiffAsync` (`scripts/infra/shared/api-diff-tools.cake`)
-therefore adds every real dependency explicitly — from packages pinned in
-`scripts/VERSIONS.txt` via `AddDep`/`AddPackageDir` — covering the framework/reference packs,
-the GTK/GIR and Maui stacks, the Xamarin.Forms platform renderers (the iOS/macOS ones ship
-under `build/XCODE11`, the rest under `lib/`, all in the one pinned `Xamarin.Forms` package),
-and SkiaSharp's own inter-package references. The sole exception is
-`_Microsoft.Android.Resource.Designer`, generated into every .NET-Android assembly and shipped
-in no package; because it is absent on every host it is skipped with `IgnoreResolutionErrors =
-true` without breaking determinism, and it is never part of SkiaSharp's public API. If a
-regeneration shows unexplained "New Type" churn, a dependency is missing — add it as a real
-`AddDep`/`AddPackageDir`; never accept the churn. (Only the cross-platform netstandard
-`SkiaSharp.Views.Forms` assembly is emitted as a changelog; the obsoleted per-platform builds
-are diffed only so the run completes, and their output is discarded.)
+#### Deterministic reference resolution
+
+**The problem.** The comparer must resolve *every* referenced assembly: an unresolved
+reference makes `Mono.ApiTools` silently degrade type matching into spurious "New Type"
+dumps whose shape depends on what is installed on the build host, so the output stops being
+deterministic. `CreateNuGetDiffAsync` (`scripts/infra/docs/api-diff-tools.cake`) therefore
+adds every real dependency explicitly.
+
+**Third-party references** come from packages pinned in `scripts/VERSIONS.txt` via
+`AddDep`/`AddPackageDir` — covering the framework/reference packs, the GTK/GIR and Maui
+stacks, and the Xamarin.Forms platform renderers (the iOS/macOS ones ship under
+`build/XCODE11`, the rest under `lib/`, all in the one pinned `Xamarin.Forms` package).
+
+**SkiaSharp's own inter-package references** (e.g. `SkiaSharp.Views.*`/`SkiaSharp.Resources`
+→ `SkiaSharp`, `SkiaSharp.Views.Maui.Controls` → `SkiaSharp.Views.Maui.Core`,
+`SkiaSharp.HarfBuzz` → `HarfBuzzSharp`) are *not* added globally. They are staged **per
+diff** by `StageSelfDepsFromNuspecAsync`, which reads the package-under-diff's own `.nuspec`
+and adds each of our managed dependencies at the **exact version that nuspec pins** — the
+version the package was actually built against — then `UnstageSearchPaths` removes them
+before the next line so a self-dependency never leaks across versions. This is
+*contemporaneous*: a 1.x diff resolves `SKObject` from the 1.x `SkiaSharp`, not from today's
+build, so it can never show inherited members the historical type never had.
+
+**It must be read from the nuspec** rather than reused from the package's own version
+because the self-dependency family is **not a single version line** — `SkiaSharp.HarfBuzz
+2.88.7` was built against `HarfBuzzSharp 7.3.0.1`, not `2.88.7` — so only the nuspec records
+the correct version for every self-dependency uniformly. `NativeAssets.*` dependencies are
+excluded (they ship only native binaries, contribute no managed types, and are the largest
+packages to fetch), and a self-dependency version that cannot be fetched is logged and
+skipped rather than aborting the run. The nuspec is frozen, so this is deterministic and
+host/cache-independent, unlike the old cache-glob that bound by enumeration order.
+
+**Why it matters.** Resolving these matters because the public SkiaSharp types derive from
+`SKObject`, which implements the `internal` infrastructure interfaces `ISKReferenceCounted`
+and `ISKSkipObjectRegistration`; if the referenced assembly is unresolved those internals
+leak into the public diff as bogus base-interface entries instead of collapsing to the
+public `System.IDisposable`.
+
+**The sole exception** is `_Microsoft.Android.Resource.Designer`, generated into every
+.NET-Android assembly and shipped in no package; because it is absent on every host it is
+skipped with `IgnoreResolutionErrors = true` without breaking determinism, and it is never
+part of SkiaSharp's public API.
+
+**Troubleshooting.** If a regeneration shows unexplained "New Type" churn, a dependency is
+missing — add it as a real `AddDep`/`AddPackageDir`; never accept the churn. (Only the
+cross-platform netstandard `SkiaSharp.Views.Forms` assembly is emitted as an api diff; the
+obsoleted per-platform builds are diffed only so the run completes, and their output is
+discarded.)
 
 ### 5.3 The "current" CI variant
 
@@ -701,6 +822,21 @@ no AI polish on the diffs
 themselves — the generated diff *is* the artifact; the human pages merely link to it
 (§1.5/§4.4).
 
+#### Package cache — cache once, run many
+
+Every package the run needs (each
+representative + baseline body and their declared dependencies) is fetched once into
+`externals/package_cache` and reused on every subsequent run. `Mono.ApiTools.NuGetDiff`
+downloads a package's *declared nuspec dependencies* on demand during the compare, not
+during the initial extract, so there is no separate "fully offline" pre-warm step — the
+on-demand path is itself idempotent (a warm cache is a no-op; only genuinely new
+packages are downloaded). Because resolution is now deterministic (§5.2), a warm and a
+cold cache produce byte-identical output, so the cache never needs to be wiped to get a
+correct result — wiping only forces a slow re-download. The docs Docker image
+(`scripts/infra/docs/docker/`) bind-mounts the host cache for warm runs and a separate
+host-owned empty dir for an explicit `--cold` run when you want to re-prove that
+equivalence.
+
 ---
 
 ## 6. Differences at a glance
@@ -709,7 +845,7 @@ Everything in §1 — line collapsing, the previous-emitted-line baseline,
 `compare_to`/supersession overrides, per-family handling, and which lines emit — is
 **identical** across both engines. They differ only here:
 
-| Concern | Release notes | API changelogs |
+| Concern | Release notes | API diffs |
 |---|---|---|
 | Generator | `generate-release-notes.py` (Python) | `api-diff.cake` (Cake) |
 | Content diffed | merged PRs (git) | public API (assemblies) |
@@ -719,7 +855,7 @@ Everything in §1 — line collapsing, the previous-emitted-line baseline,
 | HarfBuzz family | first-class hub pages under `harfbuzzsharp/` (§4.5) | first-class diff tree under `harfbuzzsharp/` (§3.4) |
 
 The split exists because release notes are read by humans tracking "what's shipped vs
-what's coming", whereas an API changelog is a mechanical record of a released
+what's coming", whereas an API diff is a mechanical record of a released
 package's surface. Both live in the docfx site under `releases/` (§3), so a release
 page links straight to its API diffs.
 
@@ -750,11 +886,18 @@ page links straight to its API diffs.
    own disk/timeout budget and streams progress to the log; it hands off to the Polish
    agent **only** through the uploaded artifact (working-tree changes + the
    `files-to-polish.txt` list), never a shared runner or stdout capture (§2.3).
-9. **API-diff output is host-independent (§5.2).** Every assembly reference is satisfied
-   by a real pinned dependency (`AddDep`/`AddPackageDir`) so resolution never depends on the
-   build host. The comparer runs with `IgnoreResolutionErrors = true` **solely** to skip the
-   single reference that ships in no package — `_Microsoft.Android.Resource.Designer`,
-   generated into every .NET-Android assembly and absent from SkiaSharp's public surface,
-   hence unresolvable identically on every host. When a regeneration produces unexpected
-   "New Type" churn, the cause is almost always a newly-missing dependency: add it as a real
-   `AddDep`/`AddPackageDir`, never treat the churn as a real API change.
+9. **API-diff output is host-independent (§5.2).** Every assembly reference is satisfied by a
+   real, host-independent dependency, so resolution is *contemporaneous* and never depends on
+   the build host or cache state:
+   - third-party references by a version pinned in `scripts/VERSIONS.txt`
+     (`AddDep`/`AddPackageDir`); and
+   - SkiaSharp's own inter-package references by the exact version pinned in the
+     package-under-diff's own `.nuspec`, staged per-diff by `StageSelfDepsFromNuspecAsync` and
+     removed afterwards.
+
+   The comparer runs with `IgnoreResolutionErrors = true` **solely** to skip the single
+   reference that ships in no package — `_Microsoft.Android.Resource.Designer`, generated into
+   every .NET-Android assembly and absent from SkiaSharp's public surface, hence unresolvable
+   identically on every host. When a regeneration produces unexpected "New Type" churn, the
+   cause is almost always a newly-missing dependency: add it as a real `AddDep`/`AddPackageDir`,
+   never treat the churn as a real API change.
diff --git a/documentation/dev/writing-docs.md b/documentation/dev/writing-docs.md
index 1ce39bef2e10..86548ab5880d 100644
--- a/documentation/dev/writing-docs.md
+++ b/documentation/dev/writing-docs.md
@@ -1,5 +1,10 @@
 # Writing Documentation
 
+> **New here?** Read **[docs-overview.md](docs-overview.md)** first — it maps the whole
+> documentation system (the four artifacts, the engines, the skills, and the cross-repo
+> automation). This page is the hands-on **operator** guide for generating and editing
+> API docs and api diffs.
+
 This guide covers generating and updating SkiaSharp API documentation.
 
 SkiaSharp provides two types of documentation: concept docs and API docs.
@@ -24,22 +29,26 @@ This repository is pulled into the main SkiaSharp repo as a Git submodule at `do
 
 ## Automated Pipeline
 
-Two workflows in this repo automate the full docs lifecycle:
+Two workflows automate the full docs lifecycle. They live in **different repos** —
+the stub-generation/AI-writing workflow is in the docs repo (it writes into that
+repo), and the submodule-sync workflow is here:
 
 ### Step 1: Stub generation + AI docs (auto-api-docs-writer)
 
 A single agentic workflow handles the entire pipeline — regenerating XML stubs from CI NuGet packages AND filling "To be added." placeholders with AI-written documentation:
 
-- **Workflow**: [`auto-api-docs-writer.md`](../../.github/workflows/auto-api-docs-writer.md) (agentic, in this repo)
+- **Workflow**: [`auto-api-docs-writer.md`](https://github.com/mono/SkiaSharp-API-docs/blob/main/.github/workflows/auto-api-docs-writer.md) (agentic, in the **docs repo** `mono/SkiaSharp-API-docs` — it checks SkiaSharp out to borrow the engines, then writes the XML into the docs repo)
 - **Schedule**: Daily at 8 AM UTC
 - **What it does**:
   1. **Pre-agent step**: Downloads latest NuGet packages from CI, runs `dotnet cake --target=update-docs` to regenerate XML stubs
   2. **AI agent**: Reads the `api-docs` skill, finds all "To be added." placeholders, reads C# source code, writes proper documentation
   3. **Post-step**: Pushes branch and creates PR in `mono/SkiaSharp-API-docs`
 - **Output**: PR `automation/write-api-docs` → `main` in `mono/SkiaSharp-API-docs`
-- **Manual trigger**: Go to [Actions](https://github.com/mono/SkiaSharp/actions/workflows/auto-api-docs-writer.lock.yml) → "Auto API Docs Writer" → "Run workflow"
+- **Manual trigger**: Go to [Actions](https://github.com/mono/SkiaSharp-API-docs/actions/workflows/auto-api-docs-writer.lock.yml) → "Auto API Docs Writer" → "Run workflow"
 
-> **Note**: There is also a standalone [`update-docs.yml`](https://github.com/mono/SkiaSharp-API-docs/blob/main/.github/workflows/update-docs.yml) workflow in the docs repo that only regenerates stubs (no AI writing). The agentic workflow above supersedes it for the full pipeline.
+> **Runner note**: `mdoc.exe` is a .NET Framework executable, but `docs.cake` runs it
+> under **mono**, so the stub-regeneration job runs on a Linux runner with
+> `mono-complete` installed (see [docs-overview.md](docs-overview.md) → Path 3).
 
 ### Step 2: Submodule sync (auto-docs-submodule-sync)
 
@@ -107,7 +116,7 @@ dotnet cake --target=docs-download-output --gitBranch=my-feature-branch
 dotnet cake --target=update-docs
 ```
 
-This generates the XML API docs in the `docs/` directory. (The API changelogs
+This generates the XML API docs in the `docs/` directory. (The API diffs
 are produced separately by the `docs-api-diff*` targets — see below.)
 
 ## Editing API Docs
@@ -128,8 +137,8 @@ Once you are happy with your changes, push them to your fork of [`mono/SkiaSharp
 
 For detailed XML documentation patterns and review criteria, see:
 
-- [`.claude/skills/api-docs/references/patterns.md`](../../.claude/skills/api-docs/references/patterns.md) — XML syntax and examples
-- [`.claude/skills/api-docs/references/checklist.md`](../../.claude/skills/api-docs/references/checklist.md) — Review severity criteria
+- [`.agents/skills/api-docs/references/patterns.md`](../../.agents/skills/api-docs/references/patterns.md) — XML syntax and examples
+- [`.agents/skills/api-docs/references/checklist.md`](../../.agents/skills/api-docs/references/checklist.md) — Review severity criteria
 
 ## Cake Targets Reference
 
@@ -137,32 +146,32 @@ For detailed XML documentation patterns and review criteria, see:
 |--------|-------------|
 | `docs-download-output` | Downloads `_nugets` and `_nugetspreview` packages from the SkiaSharp-CI Azure Artifacts feed |
 | `docs-api-diff` | Compares current (unpublished CI) NuGets against latest published versions; writes transient markdown diffs to `output/api-diff/` only (a CI gate — never the committed tree) |
-| `docs-api-diff-past` | Regenerates the committed historical API changelogs under `documentation/docfx/releases/` across all published versions |
+| `docs-api-diff-past` | Regenerates the committed historical API diffs under `documentation/docfx/releases/` across all published versions |
 | `docs-update-frameworks` | Extracts assemblies, builds `frameworks.xml` with monikers, runs `mdoc update` to generate XML API docs |
 | `docs-format-docs` | Cleans XML output, removes duplicates, syncs extension method docs, reports coverage |
-| `update-docs` | Runs `docs-update-frameworks` → `docs-format-docs` in sequence (the current API diff is a standalone CI gate and is no longer bundled here) |
+| `update-docs` | Runs `docs-update-frameworks` → `docs-format-docs` in sequence (the current API diff is a standalone CI gate, not bundled here) |
 
-> The two `docs-api-diff*` targets live in the release-notes skill at
-> [`.agents/skills/release-notes/scripts/api-diff.cake`](../../.agents/skills/release-notes/scripts/api-diff.cake);
+> The two `docs-api-diff*` targets live alongside the other doc engines at
+> [`scripts/infra/docs/api-diff.cake`](../../scripts/infra/docs/api-diff.cake);
 > the wrappers in `build.cake` just forward to it. The behavior is specified in
-> [`release-notes-and-changelogs.md`](release-notes-and-changelogs.md) — read it
+> [`release-notes-and-api-diffs.md`](release-notes-and-api-diffs.md) — read it
 > before changing either engine.
 
-## API changelogs
+## API diffs
 
-The per-assembly API changelogs are written into the in-site releases tree
+The per-assembly API diffs are written into the in-site releases tree
 (line-first, package-namespaced): `documentation/docfx/releases/<line>/{PackageId}/{Assembly}.md`
 for SkiaSharp-versioned packages, and the parallel
 `documentation/docfx/releases/harfbuzzsharp/<hb-line>/{PackageId}/{Assembly}.md`
 tree for HarfBuzzSharp-versioned packages (see
-[`release-notes-and-changelogs.md`](release-notes-and-changelogs.md) §3). They are
+[`release-notes-and-api-diffs.md`](release-notes-and-api-diffs.md) §3). They are
 generated by `Mono.ApiTools.NuGetDiff` (the `docs-api-diff-past` Cake target) and
 kept up to date automatically as part of the **Prepare** phase of the unified
 [`update-release-notes`](../../.github/workflows/update-release-notes.md) pipeline
 (on push to `main` and `release/*`, on `v*` tags, and weekly). That one workflow's
-Prepare phase regenerates both the API changelogs and the release-notes raw data,
+Prepare phase regenerates both the API diffs and the release-notes raw data,
 then the AI **Polish** phase rewrites prose, and it opens a single rolling PR with
-both the changelogs and the notes — there is no separate api-diff workflow.
+both the api diffs and the notes — there is no separate api-diff workflow.
 
 To regenerate the full committed set locally exactly the way CI does:
 
@@ -175,7 +184,7 @@ git diff documentation/docfx/releases/
 `docs-api-diff-past` diffs **published** NuGet.org versions: every version is
 compared against its predecessor, with baselines and superseded-version skips
 driven by [`scripts/infra/docs/versions.json`](../../scripts/infra/docs/versions.json) (same config the
-release-notes script uses). Superseded versions still get their own changelog;
+release-notes script uses). Superseded versions still get their own api diff;
 they are only removed from the pool of *baselines*, so e.g. `4.148.0` walks past
 the abandoned `4.147.*` previews and lands on `3.119.4`.
 
@@ -209,8 +218,8 @@ meant to be committed.
 
 ### Relationship to release notes
 
-The API changelogs (Cake) and the website release notes
-([`generate-release-notes.py`](../../.agents/skills/release-notes/scripts/generate-release-notes.py))
+The API diffs (Cake) and the website release notes
+([`generate-release-notes.py`](../../scripts/infra/docs/generate-release-notes.py))
 are **separate systems** that deliberately share only one thing:
 [`scripts/infra/docs/versions.json`](../../scripts/infra/docs/versions.json). That file is the single
 source of truth for two decisions, and both systems honour it identically:
@@ -232,7 +241,7 @@ to `versions.json` to pin both systems to the same baseline.
 Where they intentionally differ is **granularity**, and this is by design — do
 not "fix" them into agreement:
 
-- **API changelogs** produce one diff *per published NuGet package*, including
+- **API diffs** produce one diff *per published NuGet package*, including
   preview-to-preview deltas (e.g. each `4.147.0-preview.*` against the one
   before it). The audience is "what changed in this exact package".
 - **Release notes** produce one cumulative page *per release* (the highest
diff --git a/documentation/docfx/releases/1.68.2/SkiaSharp.Views/SkiaSharp.Views.Android.md b/documentation/docfx/releases/1.68.2/SkiaSharp.Views/SkiaSharp.Views.Android.md
index 3274f444b417..3158c88d8872 100644
--- a/documentation/docfx/releases/1.68.2/SkiaSharp.Views/SkiaSharp.Views.Android.md
+++ b/documentation/docfx/releases/1.68.2/SkiaSharp.Views/SkiaSharp.Views.Android.md
@@ -13,17 +13,4 @@ public SKPaintGLSurfaceEventArgs (SkiaSharp.SKSurface surface, SkiaSharp.GRBacke
 ```
 
 
-#### New Type: SkiaSharp.Views.Android.Resource
-
-```csharp
-public class Resource {
-	// constructors
-	public Resource ();
-
-	// inner types
-	public class Attribute {
-	}
-}
-```
-
 
diff --git a/documentation/docfx/releases/2.80.0/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.breaking.md b/documentation/docfx/releases/2.80.0/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.breaking.md
index 769259b1db86..7fd974c4ca78 100644
--- a/documentation/docfx/releases/2.80.0/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.breaking.md
+++ b/documentation/docfx/releases/2.80.0/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.breaking.md
@@ -4,18 +4,7 @@
 
 > Assembly Version Changed: 2.80.0.0 vs 1.68.0.0
 
-### Namespace SkiaSharp.Views.Forms
-
-#### Type Changed: SkiaSharp.Views.Forms.Resource
-
-#### Type Changed: SkiaSharp.Views.Forms.Resource.Style
-
-Removed field:
-
-```csharp
-public static int NestedScrollBarStyle;
-```
-
-
+### Removed Namespace SkiaSharp.Views.Forms.SkiaSharp_Views_Forms_UWP_XamlTypeInfo
 
 
+#### Removed Type SkiaSharp.Views.Forms.SkiaSharp_Views_Forms_UWP_XamlTypeInfo.XamlMetaDataProvider
diff --git a/documentation/docfx/releases/2.80.1/SkiaSharp.Views.Uno/SkiaSharp.Views.UWP.md b/documentation/docfx/releases/2.80.1/SkiaSharp.Views.Uno/SkiaSharp.Views.UWP.md
index 363970658d91..cb925ec2fb25 100644
--- a/documentation/docfx/releases/2.80.1/SkiaSharp.Views.Uno/SkiaSharp.Views.UWP.md
+++ b/documentation/docfx/releases/2.80.1/SkiaSharp.Views.Uno/SkiaSharp.Views.UWP.md
@@ -26,18 +26,6 @@ public static class Extensions {
 }
 ```
 
-#### New Type: SkiaSharp.Views.UWP.GlobalStaticResources
-
-```csharp
-public sealed class GlobalStaticResources {
-	// constructors
-	public GlobalStaticResources ();
-	// methods
-	public static object FindResource (string name);
-	public static void Initialize ();
-}
-```
-
 #### New Type: SkiaSharp.Views.UWP.SKPaintGLSurfaceEventArgs
 
 ```csharp
diff --git a/documentation/docfx/releases/2.80.2/SkiaSharp.Views.Uno/SkiaSharp.Views.UWP.md b/documentation/docfx/releases/2.80.2/SkiaSharp.Views.Uno/SkiaSharp.Views.UWP.md
index 7cd75820d2fd..8813cddfb528 100644
--- a/documentation/docfx/releases/2.80.2/SkiaSharp.Views.Uno/SkiaSharp.Views.UWP.md
+++ b/documentation/docfx/releases/2.80.2/SkiaSharp.Views.Uno/SkiaSharp.Views.UWP.md
@@ -26,18 +26,6 @@ public static class Extensions {
 }
 ```
 
-#### New Type: SkiaSharp.Views.UWP.GlobalStaticResources
-
-```csharp
-public sealed class GlobalStaticResources {
-	// constructors
-	public GlobalStaticResources ();
-	// methods
-	public static object FindResource (string name);
-	public static void Initialize ();
-}
-```
-
 #### New Type: SkiaSharp.Views.UWP.SKPaintGLSurfaceEventArgs
 
 ```csharp
diff --git a/documentation/docfx/releases/2.80.3/SkiaSharp.Views.Uno/SkiaSharp.Views.UWP.md b/documentation/docfx/releases/2.80.3/SkiaSharp.Views.Uno/SkiaSharp.Views.UWP.md
index fcade3e52c7b..92952f4b99cd 100644
--- a/documentation/docfx/releases/2.80.3/SkiaSharp.Views.Uno/SkiaSharp.Views.UWP.md
+++ b/documentation/docfx/releases/2.80.3/SkiaSharp.Views.Uno/SkiaSharp.Views.UWP.md
@@ -4,23 +4,6 @@
 
 ### Namespace SkiaSharp.Views.UWP
 
-#### Type Changed: SkiaSharp.Views.UWP.GlobalStaticResources
-
-Obsoleted methods:
-
-```diff
- [Obsolete ("This method is provided for binary backward compatibility. It will always return null.")]
- public static object FindResource (string name);
-```
-
-Added methods:
-
-```csharp
-public static void RegisterDefaultStyles ();
-public static void RegisterResourceDictionariesBySource ();
-```
-
-
 #### Type Changed: SkiaSharp.Views.UWP.SKSwapChainPanel
 
 Added property:
diff --git a/documentation/docfx/releases/2.88.0/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.breaking.md b/documentation/docfx/releases/2.88.0/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.breaking.md
deleted file mode 100644
index 48c90fd34013..000000000000
--- a/documentation/docfx/releases/2.88.0/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.breaking.md
+++ /dev/null
@@ -1,51 +0,0 @@
-# API diff: SkiaSharp.Views.Forms.dll
-
-## SkiaSharp.Views.Forms.dll
-
-> Assembly Version Changed: 2.88.0.0 vs 2.80.0.0
-
-### Namespace SkiaSharp.Views.Forms
-
-#### Type Changed: SkiaSharp.Views.Forms.Resource
-
-#### Type Changed: SkiaSharp.Views.Forms.Resource.Id
-
-Removed fields:
-
-```csharp
-public static int save_image_matrix;
-public static int save_scale_type;
-```
-
-
-#### Type Changed: SkiaSharp.Views.Forms.Resource.String
-
-Removed fields:
-
-```csharp
-public static int abc_font_family_body_1_material;
-public static int abc_font_family_body_2_material;
-public static int abc_font_family_button_material;
-public static int abc_font_family_caption_material;
-public static int abc_font_family_display_1_material;
-public static int abc_font_family_display_2_material;
-public static int abc_font_family_display_3_material;
-public static int abc_font_family_display_4_material;
-public static int abc_font_family_headline_material;
-public static int abc_font_family_menu_material;
-public static int abc_font_family_subhead_material;
-public static int abc_font_family_title_material;
-```
-
-
-#### Type Changed: SkiaSharp.Views.Forms.Resource.Style
-
-Removed field:
-
-```csharp
-public static int collectionViewStyle;
-```
-
-
-
-
diff --git a/documentation/docfx/releases/2.88.0/SkiaSharp.Views/SkiaSharp.Views.Android.md b/documentation/docfx/releases/2.88.0/SkiaSharp.Views/SkiaSharp.Views.Android.md
index 7cc468582582..518c5bc697cc 100644
--- a/documentation/docfx/releases/2.88.0/SkiaSharp.Views/SkiaSharp.Views.Android.md
+++ b/documentation/docfx/releases/2.88.0/SkiaSharp.Views/SkiaSharp.Views.Android.md
@@ -6,28 +6,6 @@
 
 ### Namespace SkiaSharp.Views.Android
 
-#### Type Changed: SkiaSharp.Views.Android.Resource
-
-#### Type Changed: SkiaSharp.Views.Android.Resource.Attribute
-
-Added field:
-
-```csharp
-public static int ignorePixelScaling;
-```
-
-
-#### New Type: SkiaSharp.Views.Android.Resource.Styleable
-
-```csharp
-public class Styleable {
-	// fields
-	public static int[] SKCanvasView;
-	public static int SKCanvasView_ignorePixelScaling;
-}
-```
-
-
 #### Type Changed: SkiaSharp.Views.Android.SKPaintGLSurfaceEventArgs
 
 Obsoleted constructors:
diff --git a/documentation/docfx/releases/2.88.0/index.md b/documentation/docfx/releases/2.88.0/index.md
index 6f7605a407fd..4908997856cf 100644
--- a/documentation/docfx/releases/2.88.0/index.md
+++ b/documentation/docfx/releases/2.88.0/index.md
@@ -31,7 +31,7 @@
 
 ## SkiaSharp.Views.Forms
 
-- [SkiaSharp.Views.Forms](SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.md) — ⚠️ breaking
+- [SkiaSharp.Views.Forms](SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.md)
 
 ## SkiaSharp.Views.Forms.GTK
 
diff --git a/documentation/docfx/releases/2.88.1/SkiaSharp.Views.Uno.WinUI/SkiaSharp.Views.Windows.md b/documentation/docfx/releases/2.88.1/SkiaSharp.Views.Uno.WinUI/SkiaSharp.Views.Windows.md
index fb861223c3a5..9fa6050c5667 100644
--- a/documentation/docfx/releases/2.88.1/SkiaSharp.Views.Uno.WinUI/SkiaSharp.Views.Windows.md
+++ b/documentation/docfx/releases/2.88.1/SkiaSharp.Views.Uno.WinUI/SkiaSharp.Views.Windows.md
@@ -26,22 +26,6 @@ public static class Extensions {
 }
 ```
 
-#### New Type: SkiaSharp.Views.Windows.GlobalStaticResources
-
-```csharp
-public sealed class GlobalStaticResources {
-	// constructors
-	public GlobalStaticResources ();
-	// methods
-
-	[Obsolete ("This method is provided for binary backward compatibility. It will always return null.")]
-public static object FindResource (string name);
-	public static void Initialize ();
-	public static void RegisterDefaultStyles ();
-	public static void RegisterResourceDictionariesBySource ();
-}
-```
-
 #### New Type: SkiaSharp.Views.Windows.SKPaintGLSurfaceEventArgs
 
 ```csharp
diff --git a/documentation/docfx/releases/3.0.0/SkiaSharp.Views.Maui.Controls/SkiaSharp.Views.Maui.Controls.md b/documentation/docfx/releases/3.0.0/SkiaSharp.Views.Maui.Controls/SkiaSharp.Views.Maui.Controls.md
index 2507ec3741b1..99d1553c0f54 100644
--- a/documentation/docfx/releases/3.0.0/SkiaSharp.Views.Maui.Controls/SkiaSharp.Views.Maui.Controls.md
+++ b/documentation/docfx/releases/3.0.0/SkiaSharp.Views.Maui.Controls/SkiaSharp.Views.Maui.Controls.md
@@ -29,6 +29,12 @@ Removed interface:
 ISKGLViewController
 ```
 
+Added interface:
+
+```csharp
+SkiaSharp.Views.Maui.ISKGLView
+```
+
 Added field:
 
 ```csharp
diff --git a/documentation/docfx/releases/3.0.0/SkiaSharp.Views.Uno.WinUI/SkiaSharp.Views.Windows.breaking.md b/documentation/docfx/releases/3.0.0/SkiaSharp.Views.Uno.WinUI/SkiaSharp.Views.Windows.breaking.md
index 52a2fb3e6743..6db6a7d5dfc6 100644
--- a/documentation/docfx/releases/3.0.0/SkiaSharp.Views.Uno.WinUI/SkiaSharp.Views.Windows.breaking.md
+++ b/documentation/docfx/releases/3.0.0/SkiaSharp.Views.Uno.WinUI/SkiaSharp.Views.Windows.breaking.md
@@ -6,15 +6,5 @@
 
 ### Namespace SkiaSharp.Views.Windows
 
-#### Type Changed: SkiaSharp.Views.Windows.GlobalStaticResources
-
-Removed method:
-
-```csharp
-[Obsolete ("This method is provided for binary backward compatibility. It will always return null.")]
-public static object FindResource (string name);
-```
-
-
 #### Removed Type SkiaSharp.Views.Windows.Extensions
 
diff --git a/documentation/docfx/releases/3.0.0/SkiaSharp.Views.Uno.WinUI/SkiaSharp.Views.Windows.md b/documentation/docfx/releases/3.0.0/SkiaSharp.Views.Uno.WinUI/SkiaSharp.Views.Windows.md
index fe2533ad3435..b9ed27d5d881 100644
--- a/documentation/docfx/releases/3.0.0/SkiaSharp.Views.Uno.WinUI/SkiaSharp.Views.Windows.md
+++ b/documentation/docfx/releases/3.0.0/SkiaSharp.Views.Uno.WinUI/SkiaSharp.Views.Windows.md
@@ -6,16 +6,6 @@
 
 ### Namespace SkiaSharp.Views.Windows
 
-#### Type Changed: SkiaSharp.Views.Windows.GlobalStaticResources
-
-Removed method:
-
-```csharp
-[Obsolete ("This method is provided for binary backward compatibility. It will always return null.")]
-public static object FindResource (string name);
-```
-
-
 #### Type Changed: SkiaSharp.Views.Windows.SKPaintGLSurfaceEventArgs
 
 Removed constructors:
diff --git a/documentation/docfx/releases/3.0.0/SkiaSharp.Views/SkiaSharp.Views.Android.breaking.md b/documentation/docfx/releases/3.0.0/SkiaSharp.Views/SkiaSharp.Views.Android.breaking.md
index 15017834ee83..ade8de556425 100644
--- a/documentation/docfx/releases/3.0.0/SkiaSharp.Views/SkiaSharp.Views.Android.breaking.md
+++ b/documentation/docfx/releases/3.0.0/SkiaSharp.Views/SkiaSharp.Views.Android.breaking.md
@@ -6,11 +6,6 @@
 
 ### Namespace SkiaSharp.Views.Android
 
-#### Type Changed: SkiaSharp.Views.Android.Resource
-
-#### Removed Type SkiaSharp.Views.Android.Resource.Attribute
-#### Removed Type SkiaSharp.Views.Android.Resource.Styleable
-
 #### Type Changed: SkiaSharp.Views.Android.SKCanvasView
 
 Removed method:
diff --git a/documentation/docfx/releases/3.0.0/SkiaSharp.Views/SkiaSharp.Views.Android.md b/documentation/docfx/releases/3.0.0/SkiaSharp.Views/SkiaSharp.Views.Android.md
index 5ef6415600d0..040f66efe704 100644
--- a/documentation/docfx/releases/3.0.0/SkiaSharp.Views/SkiaSharp.Views.Android.md
+++ b/documentation/docfx/releases/3.0.0/SkiaSharp.Views/SkiaSharp.Views.Android.md
@@ -6,18 +6,6 @@
 
 ### Namespace SkiaSharp.Views.Android
 
-#### Type Changed: SkiaSharp.Views.Android.Resource
-
-Modified base type:
-
-```diff
--System.Object
-+_Microsoft.Android.Resource.Designer.Resource
-```
-
-#### Removed Type SkiaSharp.Views.Android.Resource.Attribute
-#### Removed Type SkiaSharp.Views.Android.Resource.Styleable
-
 #### Type Changed: SkiaSharp.Views.Android.SKCanvasView
 
 Removed method:
diff --git a/documentation/docfx/releases/3.116.0/SkiaSharp.Views.Blazor/SkiaSharp.Views.Blazor.breaking.md b/documentation/docfx/releases/3.116.0/SkiaSharp.Views.Blazor/SkiaSharp.Views.Blazor.breaking.md
new file mode 100644
index 000000000000..b68d03556cbc
--- /dev/null
+++ b/documentation/docfx/releases/3.116.0/SkiaSharp.Views.Blazor/SkiaSharp.Views.Blazor.breaking.md
@@ -0,0 +1,11 @@
+# API diff: SkiaSharp.Views.Blazor.dll
+
+## SkiaSharp.Views.Blazor.dll
+
+> Assembly Version Changed: 3.116.0.0 vs 2.88.0.0
+
+### Removed Namespace SkiaSharp.Views.Blazor.Internal
+
+
+#### Removed Type SkiaSharp.Views.Blazor.Internal.ActionHelper
+#### Removed Type SkiaSharp.Views.Blazor.Internal.FloatFloatActionHelper
diff --git a/documentation/docfx/releases/3.116.0/SkiaSharp.Views.Blazor/SkiaSharp.Views.Blazor.md b/documentation/docfx/releases/3.116.0/SkiaSharp.Views.Blazor/SkiaSharp.Views.Blazor.md
index 26b650e76681..e4c1d41a7a75 100644
--- a/documentation/docfx/releases/3.116.0/SkiaSharp.Views.Blazor/SkiaSharp.Views.Blazor.md
+++ b/documentation/docfx/releases/3.116.0/SkiaSharp.Views.Blazor/SkiaSharp.Views.Blazor.md
@@ -36,3 +36,8 @@ public class _Imports : Microsoft.AspNetCore.Components.ComponentBase, Microsoft
 ```
 
 
+### Removed Namespace SkiaSharp.Views.Blazor.Internal
+
+
+#### Removed Type SkiaSharp.Views.Blazor.Internal.ActionHelper
+#### Removed Type SkiaSharp.Views.Blazor.Internal.FloatFloatActionHelper
diff --git a/documentation/docfx/releases/3.116.0/SkiaSharp.Views.Maui.Controls/SkiaSharp.Views.Maui.Controls.md b/documentation/docfx/releases/3.116.0/SkiaSharp.Views.Maui.Controls/SkiaSharp.Views.Maui.Controls.md
index d4c4b40a5220..29e3ba02bb53 100644
--- a/documentation/docfx/releases/3.116.0/SkiaSharp.Views.Maui.Controls/SkiaSharp.Views.Maui.Controls.md
+++ b/documentation/docfx/releases/3.116.0/SkiaSharp.Views.Maui.Controls/SkiaSharp.Views.Maui.Controls.md
@@ -29,6 +29,12 @@ Removed interface:
 ISKGLViewController
 ```
 
+Added interface:
+
+```csharp
+SkiaSharp.Views.Maui.ISKGLView
+```
+
 Added field:
 
 ```csharp
diff --git a/documentation/docfx/releases/3.116.0/SkiaSharp.Views.Uno.WinUI/SkiaSharp.Views.Windows.breaking.md b/documentation/docfx/releases/3.116.0/SkiaSharp.Views.Uno.WinUI/SkiaSharp.Views.Windows.breaking.md
index 89fb78b1285d..d077e299944c 100644
--- a/documentation/docfx/releases/3.116.0/SkiaSharp.Views.Uno.WinUI/SkiaSharp.Views.Windows.breaking.md
+++ b/documentation/docfx/releases/3.116.0/SkiaSharp.Views.Uno.WinUI/SkiaSharp.Views.Windows.breaking.md
@@ -6,15 +6,5 @@
 
 ### Namespace SkiaSharp.Views.Windows
 
-#### Type Changed: SkiaSharp.Views.Windows.GlobalStaticResources
-
-Removed method:
-
-```csharp
-[Obsolete ("This method is provided for binary backward compatibility. It will always return null.")]
-public static object FindResource (string name);
-```
-
-
 #### Removed Type SkiaSharp.Views.Windows.Extensions
 
diff --git a/documentation/docfx/releases/3.116.0/SkiaSharp.Views.Uno.WinUI/SkiaSharp.Views.Windows.md b/documentation/docfx/releases/3.116.0/SkiaSharp.Views.Uno.WinUI/SkiaSharp.Views.Windows.md
index ef0670265391..361563064baa 100644
--- a/documentation/docfx/releases/3.116.0/SkiaSharp.Views.Uno.WinUI/SkiaSharp.Views.Windows.md
+++ b/documentation/docfx/releases/3.116.0/SkiaSharp.Views.Uno.WinUI/SkiaSharp.Views.Windows.md
@@ -6,16 +6,6 @@
 
 ### Namespace SkiaSharp.Views.Windows
 
-#### Type Changed: SkiaSharp.Views.Windows.GlobalStaticResources
-
-Removed method:
-
-```csharp
-[Obsolete ("This method is provided for binary backward compatibility. It will always return null.")]
-public static object FindResource (string name);
-```
-
-
 #### Type Changed: SkiaSharp.Views.Windows.SKPaintGLSurfaceEventArgs
 
 Removed constructors:
diff --git a/documentation/docfx/releases/3.116.0/SkiaSharp.Views/SkiaSharp.Views.Android.breaking.md b/documentation/docfx/releases/3.116.0/SkiaSharp.Views/SkiaSharp.Views.Android.breaking.md
index f9ffdf3e9a5e..fa4bc49233eb 100644
--- a/documentation/docfx/releases/3.116.0/SkiaSharp.Views/SkiaSharp.Views.Android.breaking.md
+++ b/documentation/docfx/releases/3.116.0/SkiaSharp.Views/SkiaSharp.Views.Android.breaking.md
@@ -6,11 +6,6 @@
 
 ### Namespace SkiaSharp.Views.Android
 
-#### Type Changed: SkiaSharp.Views.Android.Resource
-
-#### Removed Type SkiaSharp.Views.Android.Resource.Attribute
-#### Removed Type SkiaSharp.Views.Android.Resource.Styleable
-
 #### Type Changed: SkiaSharp.Views.Android.SKCanvasView
 
 Removed method:
diff --git a/documentation/docfx/releases/3.116.0/SkiaSharp.Views/SkiaSharp.Views.Android.md b/documentation/docfx/releases/3.116.0/SkiaSharp.Views/SkiaSharp.Views.Android.md
index 5c58a3712217..fc634f69b1fe 100644
--- a/documentation/docfx/releases/3.116.0/SkiaSharp.Views/SkiaSharp.Views.Android.md
+++ b/documentation/docfx/releases/3.116.0/SkiaSharp.Views/SkiaSharp.Views.Android.md
@@ -6,18 +6,6 @@
 
 ### Namespace SkiaSharp.Views.Android
 
-#### Type Changed: SkiaSharp.Views.Android.Resource
-
-Modified base type:
-
-```diff
--System.Object
-+_Microsoft.Android.Resource.Designer.Resource
-```
-
-#### Removed Type SkiaSharp.Views.Android.Resource.Attribute
-#### Removed Type SkiaSharp.Views.Android.Resource.Styleable
-
 #### Type Changed: SkiaSharp.Views.Android.SKCanvasView
 
 Removed method:
diff --git a/documentation/docfx/releases/3.116.0/index.md b/documentation/docfx/releases/3.116.0/index.md
index 48ef5891b56f..aeda3c9c1306 100644
--- a/documentation/docfx/releases/3.116.0/index.md
+++ b/documentation/docfx/releases/3.116.0/index.md
@@ -32,7 +32,7 @@
 
 ## SkiaSharp.Views.Blazor
 
-- [SkiaSharp.Views.Blazor](SkiaSharp.Views.Blazor/SkiaSharp.Views.Blazor.md)
+- [SkiaSharp.Views.Blazor](SkiaSharp.Views.Blazor/SkiaSharp.Views.Blazor.md) — ⚠️ breaking
 
 ## SkiaSharp.Views.Desktop.Common
 
diff --git a/documentation/docfx/releases/3.119.0/SkiaSharp.Direct3D.Vortice/SkiaSharp.Direct3D.Vortice.md b/documentation/docfx/releases/3.119.0/SkiaSharp.Direct3D.Vortice/SkiaSharp.Direct3D.Vortice.md
index 9c6e58f6a098..c02e142ba41c 100644
--- a/documentation/docfx/releases/3.119.0/SkiaSharp.Direct3D.Vortice/SkiaSharp.Direct3D.Vortice.md
+++ b/documentation/docfx/releases/3.119.0/SkiaSharp.Direct3D.Vortice/SkiaSharp.Direct3D.Vortice.md
@@ -9,7 +9,7 @@
 #### New Type: SkiaSharp.GRVorticeD3DBackendContext
 
 ```csharp
-public class GRVorticeD3DBackendContext : SkiaSharp.GRD3DBackendContext {
+public class GRVorticeD3DBackendContext : SkiaSharp.GRD3DBackendContext, System.IDisposable {
 	// constructors
 	public GRVorticeD3DBackendContext ();
 	// properties
@@ -22,7 +22,7 @@ public class GRVorticeD3DBackendContext : SkiaSharp.GRD3DBackendContext {
 #### New Type: SkiaSharp.GRVorticeD3DTextureResourceInfo
 
 ```csharp
-public class GRVorticeD3DTextureResourceInfo : SkiaSharp.GRD3DTextureResourceInfo {
+public class GRVorticeD3DTextureResourceInfo : SkiaSharp.GRD3DTextureResourceInfo, System.IDisposable {
 	// constructors
 	public GRVorticeD3DTextureResourceInfo ();
 	// properties
diff --git a/documentation/docfx/releases/3.119.3.md b/documentation/docfx/releases/3.119.3.md
deleted file mode 100644
index d2b99e9d9ff7..000000000000
--- a/documentation/docfx/releases/3.119.3.md
+++ /dev/null
@@ -1,97 +0,0 @@
-<!--
-  RAW PR DATA — Do not remove this comment block.
-  AI uses this data to generate the polished release notes below.
-  Re-run the script to refresh this data from git history.
-
-  Generated: 2026-06-17T23:59:07Z by generate-release-notes.py
-  version:   3.119.3
-  status:    preview
-  superseded: 3.119.4 (preview only, never released as stable)
-  branch:    release/3.119.3-preview.1
-  diff:      release/3.119.2..release/3.119.3-preview.1
-  prs:       34
-  api:       self=3.119.3/index.md;hb=8.3.1.4
-
-  PRs grouped by the preview they first shipped in (newest first). Render each milestone as a trailing
-  "## <label> (<date>)" section per TEMPLATE.md, and merge them all for the top-level Highlights:
-
-  ## Preview 1 · 3.119.3 · 2026-02-07 · https://github.com/mono/SkiaSharp/compare/v3.119.2...v3.119.3-preview.1.1  (34 PRs)
-    - Bump to the next version (3.119.3) after release by @mattleibow in https://github.com/mono/SkiaSharp/pull/3507
-    - Add Linux Docker integration tests for release testing by @mattleibow in https://github.com/mono/SkiaSharp/pull/3506
-    - Fix stable version handling in release skills by @mattleibow in https://github.com/mono/SkiaSharp/pull/3505
-    - Add semver ordering guidance to release skills by @mattleibow in https://github.com/mono/SkiaSharp/pull/3504
-    - Add Spectre mitigation flag for libSkiaSharp.so. by @sshumakov in https://github.com/mono/SkiaSharp/pull/3502 [community ✨]
-    - Fix release-testing skill consistency issues by @mattleibow in https://github.com/mono/SkiaSharp/pull/3501
-    - Add Spectre mitigation flag for libSkiaSharp.dll. by @sshumakov in https://github.com/mono/SkiaSharp/pull/3496 [community ✨]
-    - Fix Linux ARM64 crash: add fontconfig runtime library to cross-compile sysroot by @mattleibow in https://github.com/mono/SkiaSharp/pull/3494
-    - Add 'copilot' label step to bug-fix skill PR workflow by @mattleibow in https://github.com/mono/SkiaSharp/pull/3495
-    - Fix AoT crash when IlcDisableReflection=true by @Copilot in https://github.com/mono/SkiaSharp/pull/3485 [community ✨]
-    - Improve AI instructions and skills by @mattleibow in https://github.com/mono/SkiaSharp/pull/3488
-    - Add structured workflow for adding APIs to SkiaSharp by @Copilot in https://github.com/mono/SkiaSharp/pull/3483 [community ✨]
-    - Use the new CI feed to download the pre-built artifacts by @mattleibow in https://github.com/mono/SkiaSharp/pull/3486
-    - Add NuGet feed management tools and PR package download script by @mattleibow in https://github.com/mono/SkiaSharp/pull/3479
-    - Update libwebp to 1.6.0 by @mattleibow in https://github.com/mono/SkiaSharp/pull/3478 (skia: mono/skia#167)
-    - Improve native-dependency-update skill Phase 5 instructions by @mattleibow in https://github.com/mono/SkiaSharp/pull/3477
-    - Add debugging methodology documentation by @mattleibow in https://github.com/mono/SkiaSharp/pull/3468
-    - Strengthen skill guidance on submodule merge sequence by @mattleibow in https://github.com/mono/SkiaSharp/pull/3475
-    - Fix skia submodule to point to squashed commit by @mattleibow in https://github.com/mono/SkiaSharp/pull/3474 (skia: mono/skia#165)
-    - Update brotli to 1.2.0 by @mattleibow in https://github.com/mono/SkiaSharp/pull/3469
-    - Bump libexpat from 2.6.4 to 2.7.3 by @mattleibow in https://github.com/mono/SkiaSharp/pull/3458
-    - Remove unused deps and add deps docs by @mattleibow in https://github.com/mono/SkiaSharp/pull/3463 (skia: mono/skia#164)
-    - Update more skills by @mattleibow in https://github.com/mono/SkiaSharp/pull/3460
-    - Update native-dependency-update skill with guardrails by @mattleibow in https://github.com/mono/SkiaSharp/pull/3457
-    - Update SkiaSharp package source URL in nuget.config by @mattleibow in https://github.com/mono/SkiaSharp/pull/3459
-    - Update the native dependency bump skills by @mattleibow in https://github.com/mono/SkiaSharp/pull/3455
-    - Update libpng to 1.6.54 by @mattleibow in https://github.com/mono/SkiaSharp/pull/3452 (skia: mono/skia#162)
-    - Update docs submodule by @mattleibow in https://github.com/mono/SkiaSharp/pull/3454
-    - Add native dependency update skill by @mattleibow in https://github.com/mono/SkiaSharp/pull/3453
-    - Add AI release skills and integration test suite by @mattleibow in https://github.com/mono/SkiaSharp/pull/3451
-    - Fix the version processing by @mattleibow in https://github.com/mono/SkiaSharp/pull/3450
-    - Add API guidelines and implement-issue skill by @mattleibow in https://github.com/mono/SkiaSharp/pull/3445
-    - Document HarfBuzzSharp versioning in release process by @mattleibow in https://github.com/mono/SkiaSharp/pull/3447
-    - Bump to the next version (3.119.3) after release by @mattleibow in https://github.com/mono/SkiaSharp/pull/3446
--->
-
-<!-- Generated: 2026-06-18T00:00:00Z by claude-sonnet-4.5 -->
-
-# Version 3.119.3
-
-> **Preview only** · Superseded by [3.119.4](3.119.4.md) · Never released as stable — these changes rolled up into 3.119.4 · [NuGet](https://www.nuget.org/packages/SkiaSharp/3.119.3-preview)
-
-> **API changes** · [SkiaSharp API diff](3.119.3/index.md) · [HarfBuzzSharp 8.3.1.4](harfbuzzsharp/8.3.1.4.md)
-
-## Highlights
-
-This preview concentrated on native hardening, dependency refreshes, and compatibility fixes across Linux ARM64 and ahead-of-time scenarios. It never shipped as a stable release and was rolled forward into 3.119.4. HarfBuzzSharp 8.3.1.4 ships alongside this preview line; see the linked companion page for its binding details.
-
-## Breaking Changes
-
-*None in this release.*
-
-## Security
-
-- **Spectre mitigations for Windows and Linux** — Adds Spectre hardening to both the Windows DLLs and `libSkiaSharp.so`. ❤️ [@sshumakov](https://github.com/sshumakov) ([#3496](https://github.com/mono/SkiaSharp/pull/3496), [#3502](https://github.com/mono/SkiaSharp/pull/3502))
-
-## Bug Fixes
-
-- **Linux ARM64 startup crash** — Fixes a Linux ARM64 crash by adding the missing `fontconfig` runtime library to the cross-compile sysroot. ([#3494](https://github.com/mono/SkiaSharp/pull/3494))
-- **AoT crash with `IlcDisableReflection=true`** — Fixes an ahead-of-time runtime crash in trimmed applications. ❤️ [@Copilot](https://github.com/Copilot) ([#3485](https://github.com/mono/SkiaSharp/pull/3485))
-
-## Dependency Updates
-
-- **Native library refreshes** — Updates libwebp to 1.6.0, brotli to 1.2.0, libexpat to 2.7.3, and libpng to 1.6.54. ([#3478](https://github.com/mono/SkiaSharp/pull/3478), [#3469](https://github.com/mono/SkiaSharp/pull/3469), [#3458](https://github.com/mono/SkiaSharp/pull/3458), [#3452](https://github.com/mono/SkiaSharp/pull/3452))
-
-## Community Contributors ❤️
-
-| Contributor | What They Did |
-|-------------|--------------|
-| [@sshumakov](https://github.com/sshumakov) | Added Spectre hardening for Windows and Linux native binaries |
-| [@Copilot](https://github.com/Copilot) | Fixed the AoT crash when `IlcDisableReflection=true` |
-
----
-
-## Preview 1 (February 7, 2026)
-
-Introduced native hardening, refreshed several bundled dependencies, and fixed Linux ARM64 and AoT compatibility issues.
-
-[Full Changelog](https://github.com/mono/SkiaSharp/compare/v3.119.2...v3.119.3-preview.1.1)
diff --git a/documentation/docfx/releases/4.148.0/SkiaSharp.HarfBuzz/SkiaSharp.HarfBuzz.md b/documentation/docfx/releases/4.148.0/SkiaSharp.HarfBuzz/SkiaSharp.HarfBuzz.md
deleted file mode 100644
index 5558ee398872..000000000000
--- a/documentation/docfx/releases/4.148.0/SkiaSharp.HarfBuzz/SkiaSharp.HarfBuzz.md
+++ /dev/null
@@ -1,38 +0,0 @@
-# API diff: SkiaSharp.HarfBuzz.dll
-
-## SkiaSharp.HarfBuzz.dll
-
-> Assembly Version Changed: 4.148.0.0 vs 3.119.0.0
-
-### Namespace SkiaSharp.HarfBuzz
-
-#### Type Changed: SkiaSharp.HarfBuzz.CanvasExtensions
-
-Obsoleted methods:
-
-```diff
- [Obsolete ("Use the overload with SKTextAlign parameter instead.")]
- public static void DrawShapedText (this SkiaSharp.SKCanvas canvas, string text, SkiaSharp.SKPoint p, SkiaSharp.SKFont font, SkiaSharp.SKPaint paint);
- [Obsolete ("Use the overload with SKTextAlign parameter instead.")]
- public static void DrawShapedText (this SkiaSharp.SKCanvas canvas, SKShaper shaper, string text, SkiaSharp.SKPoint p, SkiaSharp.SKFont font, SkiaSharp.SKPaint paint);
- [Obsolete ("Use the overload with SKTextAlign parameter instead.")]
- public static void DrawShapedText (this SkiaSharp.SKCanvas canvas, string text, float x, float y, SkiaSharp.SKFont font, SkiaSharp.SKPaint paint);
- [Obsolete ("Use the overload with SKTextAlign parameter instead.")]
- public static void DrawShapedText (this SkiaSharp.SKCanvas canvas, SKShaper shaper, string text, float x, float y, SkiaSharp.SKFont font, SkiaSharp.SKPaint paint);
-```
-
-
-#### New Type: SkiaSharp.HarfBuzz.ColorExtensions
-
-```csharp
-public static class ColorExtensions {
-	// methods
-	public static HarfBuzzSharp.HBColor ToHBColor (this SkiaSharp.SKColor color);
-	public static HarfBuzzSharp.HBColor ToHBColor (this SkiaSharp.SKColorF color);
-	public static SkiaSharp.SKColor ToSKColor (this HarfBuzzSharp.HBColor hbColor);
-	public static SkiaSharp.SKColorF ToSKColorF (this HarfBuzzSharp.HBColor hbColor);
-	public static SkiaSharp.SKColor[] ToSKColors (this HarfBuzzSharp.HBColor[] hbColors);
-}
-```
-
-
diff --git a/documentation/docfx/releases/4.148.0/SkiaSharp/SkiaSharp.breaking.md b/documentation/docfx/releases/4.148.0/SkiaSharp/SkiaSharp.breaking.md
deleted file mode 100644
index 224bd9c3c62e..000000000000
--- a/documentation/docfx/releases/4.148.0/SkiaSharp/SkiaSharp.breaking.md
+++ /dev/null
@@ -1,45 +0,0 @@
-# API diff: SkiaSharp.dll
-
-## SkiaSharp.dll
-
-> Assembly Version Changed: 4.148.0.0 vs 3.119.0.0
-
-### Namespace SkiaSharp
-
-#### Type Changed: SkiaSharp.GRVkImageInfo
-
-Modified properties:
-
-```diff
--public GrVkYcbcrConversionInfo YcbcrConversionInfo { get; set; }
-+public GRVkYcbcrConversionInfo YcbcrConversionInfo { get; set; }
-```
-
-
-#### Type Changed: SkiaSharp.GrVkYcbcrConversionInfo
-
-Removed interface:
-
-```csharp
-System.IEquatable<GrVkYcbcrConversionInfo>
-```
-
-Removed methods:
-
-```csharp
-public virtual bool Equals (GrVkYcbcrConversionInfo obj);
-public static bool op_Equality (GrVkYcbcrConversionInfo left, GrVkYcbcrConversionInfo right);
-public static bool op_Inequality (GrVkYcbcrConversionInfo left, GrVkYcbcrConversionInfo right);
-```
-
-
-#### Type Changed: SkiaSharp.SKNativeObject
-
-Modified properties:
-
-```diff
- protected bool IgnorePublicDispose { get; ---set;--- }
-```
-
-
-
diff --git a/documentation/docfx/releases/4.148.0/SkiaSharp/SkiaSharp.md b/documentation/docfx/releases/4.148.0/SkiaSharp/SkiaSharp.md
deleted file mode 100644
index 1e2bf73f5ee0..000000000000
--- a/documentation/docfx/releases/4.148.0/SkiaSharp/SkiaSharp.md
+++ /dev/null
@@ -1,671 +0,0 @@
-# API diff: SkiaSharp.dll
-
-## SkiaSharp.dll
-
-> Assembly Version Changed: 4.148.0.0 vs 3.119.0.0
-
-### Namespace SkiaSharp
-
-#### Type Changed: SkiaSharp.GRContext
-
-Added methods:
-
-```csharp
-public void Flush (SKImage image);
-public void Flush (SKSurface surface);
-```
-
-
-#### Type Changed: SkiaSharp.GRVkImageInfo
-
-Modified properties:
-
-```diff
--public GrVkYcbcrConversionInfo YcbcrConversionInfo { get; set; }
-+public GRVkYcbcrConversionInfo YcbcrConversionInfo { get; set; }
-```
-
-
-#### Type Changed: SkiaSharp.GrVkYcbcrConversionInfo
-
-Removed interface:
-
-```csharp
-System.IEquatable<GrVkYcbcrConversionInfo>
-```
-
-Obsoleted properties:
-
-```diff
- [Obsolete ("FormatFeatures is no longer supported in the native API.")]
- public uint FormatFeatures { get; set; }
-```
-
-Added properties:
-
-```csharp
-public GRVkYcbcrComponents Components { get; set; }
-public bool SamplerFilterMustMatchChromaFilter { get; set; }
-public bool SupportsLinearFilter { get; set; }
-```
-
-Removed methods:
-
-```csharp
-public virtual bool Equals (GrVkYcbcrConversionInfo obj);
-public override bool Equals (object obj);
-public override int GetHashCode ();
-public static bool op_Equality (GrVkYcbcrConversionInfo left, GrVkYcbcrConversionInfo right);
-public static bool op_Inequality (GrVkYcbcrConversionInfo left, GrVkYcbcrConversionInfo right);
-```
-
-Added methods:
-
-```csharp
-public static GrVkYcbcrConversionInfo op_Implicit (GRVkYcbcrConversionInfo value);
-public static GRVkYcbcrConversionInfo op_Implicit (GrVkYcbcrConversionInfo value);
-```
-
-
-#### Type Changed: SkiaSharp.SKCanvas
-
-Obsoleted methods:
-
-```diff
- [Obsolete ("Use the overload with SKSamplingOptions instead.")]
- public void DrawAtlas (SKImage atlas, SKRect[] sprites, SKRotationScaleMatrix[] transforms, SKPaint paint);
- [Obsolete ("Use the overload with SKSamplingOptions instead.")]
- public void DrawAtlas (SKImage atlas, SKRect[] sprites, SKRotationScaleMatrix[] transforms, SKColor[] colors, SKBlendMode mode, SKPaint paint);
- [Obsolete ("Use the overload with SKSamplingOptions instead.")]
- public void DrawAtlas (SKImage atlas, SKRect[] sprites, SKRotationScaleMatrix[] transforms, SKColor[] colors, SKBlendMode mode, SKRect cullRect, SKPaint paint);
- [Obsolete ("Use the overload with SKSamplingOptions instead.")]
- public void DrawBitmap (SKBitmap bitmap, SKPoint p, SKPaint paint);
- [Obsolete ("Use the overload with SKSamplingOptions instead.")]
- public void DrawBitmap (SKBitmap bitmap, SKRect dest, SKPaint paint);
- [Obsolete ("Use the overload with SKSamplingOptions instead.")]
- public void DrawBitmap (SKBitmap bitmap, SKRect source, SKRect dest, SKPaint paint);
- [Obsolete ("Use the overload with SKSamplingOptions instead.")]
- public void DrawBitmap (SKBitmap bitmap, float x, float y, SKPaint paint);
- [Obsolete ("Use the overload with SKSamplingOptions instead.")]
- public void DrawImage (SKImage image, SKPoint p, SKPaint paint);
- [Obsolete ("Use the overload with SKSamplingOptions instead.")]
- public void DrawImage (SKImage image, SKRect dest, SKPaint paint);
- [Obsolete ("Use the overload with SKSamplingOptions instead.")]
- public void DrawImage (SKImage image, SKRect source, SKRect dest, SKPaint paint);
- [Obsolete ("Use the overload with SKSamplingOptions instead.")]
- public void DrawImage (SKImage image, float x, float y, SKPaint paint);
- [Obsolete ("Use DrawText(string text, SKPoint p, SKTextAlign textAlign, SKFont font, SKPaint paint) instead.")]
- public void DrawText (string text, SKPoint p, SKFont font, SKPaint paint);
- [Obsolete ("Use DrawText(string text, float x, float y, SKTextAlign textAlign, SKFont font, SKPaint paint) instead.")]
- public void DrawText (string text, float x, float y, SKFont font, SKPaint paint);
- [Obsolete ("Use the overload with SKTextAlign parameter instead.")]
- public void DrawTextOnPath (string text, SKPath path, SKPoint offset, SKFont font, SKPaint paint);
- [Obsolete ("Use the overload with SKTextAlign parameter instead.")]
- public void DrawTextOnPath (string text, SKPath path, SKPoint offset, bool warpGlyphs, SKFont font, SKPaint paint);
- [Obsolete ("Use the overload with SKTextAlign parameter instead.")]
- public void DrawTextOnPath (string text, SKPath path, float hOffset, float vOffset, SKFont font, SKPaint paint);
-```
-
-Added methods:
-
-```csharp
-public void DrawBitmap (SKBitmap bitmap, SKPoint p, SKSamplingOptions sampling, SKPaint paint);
-public void DrawBitmap (SKBitmap bitmap, SKRect dest, SKSamplingOptions sampling, SKPaint paint);
-public void DrawBitmap (SKBitmap bitmap, SKRect source, SKRect dest, SKSamplingOptions sampling, SKPaint paint);
-public void DrawBitmap (SKBitmap bitmap, float x, float y, SKSamplingOptions sampling, SKPaint paint);
-public void DrawSurface (SKSurface surface, SKPoint p, SKSamplingOptions sampling, SKPaint paint);
-public void DrawSurface (SKSurface surface, float x, float y, SKSamplingOptions sampling, SKPaint paint);
-```
-
-
-#### Type Changed: SkiaSharp.SKColorSpace
-
-Added method:
-
-```csharp
-public static SKColorSpace CreateCicp (SKColorspacePrimariesCicp colorPrimaries, SKColorspaceTransferFnCicp transferCharacteristics);
-```
-
-
-#### Type Changed: SkiaSharp.SKColorType
-
-Added values:
-
-```csharp
-Bgra10101010XR = 25,
-R16Unorm = 27,
-RF16 = 28,
-RgbF16F16F16x = 26,
-```
-
-
-#### Type Changed: SkiaSharp.SKDocument
-
-Added methods:
-
-```csharp
-public static SKDocument CreateXps (SKWStream stream, SKDocumentXpsOptions options);
-public static SKDocument CreateXps (System.IO.Stream stream, SKDocumentXpsOptions options);
-public static SKDocument CreateXps (string path, SKDocumentXpsOptions options);
-```
-
-
-#### Type Changed: SkiaSharp.SKMaskFilter
-
-Added method:
-
-```csharp
-public static SKMaskFilter CreateShader (SKShader shader);
-```
-
-
-#### Type Changed: SkiaSharp.SKNativeObject
-
-Modified properties:
-
-```diff
- protected bool IgnorePublicDispose { get; ---set;--- }
-```
-
-
-#### Type Changed: SkiaSharp.SKPaint
-
-Obsoleted methods:
-
-```diff
- [Obsolete ("Use the SKPathBuilder overload instead.")]
- public bool GetFillPath (SKPath src, SKPath dst);
- [Obsolete ("Use the SKPathBuilder overload instead.")]
- public bool GetFillPath (SKPath src, SKPath dst, SKMatrix matrix);
- [Obsolete ("Use the SKPathBuilder overload instead.")]
- public bool GetFillPath (SKPath src, SKPath dst, SKRect cullRect);
- [Obsolete ("Use the SKPathBuilder overload instead.")]
- public bool GetFillPath (SKPath src, SKPath dst, float resScale);
- [Obsolete ("Use the SKPathBuilder overload instead.")]
- public bool GetFillPath (SKPath src, SKPath dst, SKRect cullRect, SKMatrix matrix);
- [Obsolete ("Use the SKPathBuilder overload instead.")]
- public bool GetFillPath (SKPath src, SKPath dst, SKRect cullRect, float resScale);
-```
-
-Added methods:
-
-```csharp
-public bool GetFillPath (SKPath src, SKPathBuilder dst);
-public bool GetFillPath (SKPath src, SKPathBuilder dst, SKMatrix matrix);
-public bool GetFillPath (SKPath src, SKPathBuilder dst, SKRect cullRect);
-public bool GetFillPath (SKPath src, SKPathBuilder dst, float resScale);
-public bool GetFillPath (SKPath src, SKPathBuilder dst, SKRect cullRect, SKMatrix matrix);
-public bool GetFillPath (SKPath src, SKPathBuilder dst, SKRect cullRect, float resScale);
-```
-
-
-#### Type Changed: SkiaSharp.SKPath
-
-Added property:
-
-```csharp
-protected override IntPtr Handle { get; set; }
-```
-
-Obsoleted methods:
-
-```diff
- [Obsolete ("Use SKPathBuilder instead.")]
- public void AddArc (SKRect oval, float startAngle, float sweepAngle);
- [Obsolete ("Use SKPathBuilder instead.")]
- public void AddCircle (float x, float y, float radius, SKPathDirection dir);
- [Obsolete ("Use SKPathBuilder instead.")]
- public void AddOval (SKRect rect, SKPathDirection direction);
- [Obsolete ("Use SKPathBuilder instead.")]
- public void AddPath (SKPath other, SKPathAddMode mode);
- [Obsolete ("Use SKPathBuilder instead.")]
- public void AddPath (SKPath other, ref SKMatrix matrix, SKPathAddMode mode);
- [Obsolete ("Use SKPathBuilder instead.")]
- public void AddPath (SKPath other, float dx, float dy, SKPathAddMode mode);
- [Obsolete ("Use SKPathBuilder instead.")]
- public void AddPathReverse (SKPath other);
- [Obsolete ("Use SKPathBuilder instead.")]
- public void AddPoly (SKPoint[] points, bool close);
- [Obsolete ("Use SKPathBuilder instead.")]
- public void AddPoly (System.ReadOnlySpan<SKPoint> points, bool close);
- [Obsolete ("Use SKPathBuilder instead.")]
- public void AddRect (SKRect rect, SKPathDirection direction);
- [Obsolete ("Use SKPathBuilder instead.")]
- public void AddRect (SKRect rect, SKPathDirection direction, uint startIndex);
- [Obsolete ("Use SKPathBuilder instead.")]
- public void AddRoundRect (SKRoundRect rect, SKPathDirection direction);
- [Obsolete ("Use SKPathBuilder instead.")]
- public void AddRoundRect (SKRoundRect rect, SKPathDirection direction, uint startIndex);
- [Obsolete ("Use SKPathBuilder instead.")]
- public void AddRoundRect (SKRect rect, float rx, float ry, SKPathDirection dir);
- [Obsolete ("Use SKPathBuilder instead.")]
- public void ArcTo (SKPoint point1, SKPoint point2, float radius);
- [Obsolete ("Use SKPathBuilder instead.")]
- public void ArcTo (SKRect oval, float startAngle, float sweepAngle, bool forceMoveTo);
- [Obsolete ("Use SKPathBuilder instead.")]
- public void ArcTo (SKPoint r, float xAxisRotate, SKPathArcSize largeArc, SKPathDirection sweep, SKPoint xy);
- [Obsolete ("Use SKPathBuilder instead.")]
- public void ArcTo (float x1, float y1, float x2, float y2, float radius);
- [Obsolete ("Use SKPathBuilder instead.")]
- public void ArcTo (float rx, float ry, float xAxisRotate, SKPathArcSize largeArc, SKPathDirection sweep, float x, float y);
- [Obsolete ("Use SKPathBuilder instead.")]
- public void Close ();
- [Obsolete ("Use SKPathBuilder instead.")]
- public void ConicTo (SKPoint point0, SKPoint point1, float w);
- [Obsolete ("Use SKPathBuilder instead.")]
- public void ConicTo (float x0, float y0, float x1, float y1, float w);
- [Obsolete ("Use SKPathBuilder instead.")]
- public void CubicTo (SKPoint point0, SKPoint point1, SKPoint point2);
- [Obsolete ("Use SKPathBuilder instead.")]
- public void CubicTo (float x0, float y0, float x1, float y1, float x2, float y2);
- [Obsolete ("Use SKPathBuilder instead.")]
- public void LineTo (SKPoint point);
- [Obsolete ("Use SKPathBuilder instead.")]
- public void LineTo (float x, float y);
- [Obsolete ("Use SKPathBuilder instead.")]
- public void MoveTo (SKPoint point);
- [Obsolete ("Use SKPathBuilder instead.")]
- public void MoveTo (float x, float y);
- [Obsolete ("Use SKPathBuilder instead.")]
- public void QuadTo (SKPoint point0, SKPoint point1);
- [Obsolete ("Use SKPathBuilder instead.")]
- public void QuadTo (float x0, float y0, float x1, float y1);
- [Obsolete ("Use SKPathBuilder instead.")]
- public void RArcTo (SKPoint r, float xAxisRotate, SKPathArcSize largeArc, SKPathDirection sweep, SKPoint xy);
- [Obsolete ("Use SKPathBuilder instead.")]
- public void RArcTo (float rx, float ry, float xAxisRotate, SKPathArcSize largeArc, SKPathDirection sweep, float x, float y);
- [Obsolete ("Use SKPathBuilder instead.")]
- public void RConicTo (SKPoint point0, SKPoint point1, float w);
- [Obsolete ("Use SKPathBuilder instead.")]
- public void RConicTo (float dx0, float dy0, float dx1, float dy1, float w);
- [Obsolete ("Use SKPathBuilder instead.")]
- public void RCubicTo (SKPoint point0, SKPoint point1, SKPoint point2);
- [Obsolete ("Use SKPathBuilder instead.")]
- public void RCubicTo (float dx0, float dy0, float dx1, float dy1, float dx2, float dy2);
- [Obsolete ("Use SKPathBuilder instead.")]
- public void RLineTo (SKPoint point);
- [Obsolete ("Use SKPathBuilder instead.")]
- public void RLineTo (float dx, float dy);
- [Obsolete ("Use SKPathBuilder instead.")]
- public void RMoveTo (SKPoint point);
- [Obsolete ("Use SKPathBuilder instead.")]
- public void RMoveTo (float dx, float dy);
- [Obsolete ("Use SKPathBuilder instead.")]
- public void RQuadTo (SKPoint point0, SKPoint point1);
- [Obsolete ("Use SKPathBuilder instead.")]
- public void RQuadTo (float dx0, float dy0, float dx1, float dy1);
- [Obsolete ("Use SKPathBuilder instead.")]
- public void Rewind ();
-```
-
-
-#### Type Changed: SkiaSharp.SKPathMeasure
-
-Obsoleted methods:
-
-```diff
- [Obsolete ("Use the SKPathBuilder overload instead.")]
- public bool GetSegment (float start, float stop, SKPath dst, bool startWithMoveTo);
-```
-
-Added method:
-
-```csharp
-public bool GetSegment (float start, float stop, SKPathBuilder dst, bool startWithMoveTo);
-```
-
-
-#### Type Changed: SkiaSharp.SKStream
-
-Obsoleted methods:
-
-```diff
- [Obsolete ("The native stream move offset is capped at a 32-bit int. Use Move(int) instead.")]
- public bool Move (long offset);
-```
-
-Added method:
-
-```csharp
-public SKData GetData ();
-```
-
-
-#### Type Changed: SkiaSharp.SKSurface
-
-Added methods:
-
-```csharp
-public void Draw (SKCanvas canvas, SKPoint p, SKSamplingOptions sampling, SKPaint paint);
-public void Draw (SKCanvas canvas, float x, float y, SKSamplingOptions sampling, SKPaint paint);
-```
-
-
-#### Type Changed: SkiaSharp.SKTypeface
-
-Added properties:
-
-```csharp
-public static SKTypeface Empty { get; }
-public bool IsEmpty { get; }
-public int VariationDesignParameterCount { get; }
-public SKFontVariationAxis[] VariationDesignParameters { get; }
-public SKFontVariationPositionCoordinate[] VariationDesignPosition { get; }
-public int VariationDesignPositionCount { get; }
-```
-
-Obsoleted methods:
-
-```diff
- [Obsolete ("Use SKFont directly instead.")]
- public bool ContainsGlyph (int codepoint);
- [Obsolete ("Use SKFont directly instead.")]
- public bool ContainsGlyphs (System.ReadOnlySpan<char> text);
- [Obsolete ("Use SKFont directly instead.")]
- public bool ContainsGlyphs (System.ReadOnlySpan<int> codepoints);
- [Obsolete ("Use SKFont directly instead.")]
- public bool ContainsGlyphs (string text);
- [Obsolete ("Use SKFont directly instead.")]
- public bool ContainsGlyphs (System.ReadOnlySpan<byte> text, SKTextEncoding encoding);
- [Obsolete ("Use SKFont directly instead.")]
- public bool ContainsGlyphs (IntPtr text, int length, SKTextEncoding encoding);
- [Obsolete ("Use SKFont directly instead.")]
- public int CountGlyphs (System.ReadOnlySpan<char> str);
- [Obsolete ("Use SKFont directly instead.")]
- public int CountGlyphs (string str);
- [Obsolete ("Use SKFont directly instead.")]
- public int CountGlyphs (byte[] str, SKTextEncoding encoding);
- [Obsolete ("Use SKFont directly instead.")]
- public int CountGlyphs (System.ReadOnlySpan<byte> str, SKTextEncoding encoding);
- [Obsolete ("Use SKFont directly instead.")]
- public int CountGlyphs (IntPtr str, int strLen, SKTextEncoding encoding);
- [Obsolete ("Use SKFont directly instead.")]
- public ushort GetGlyph (int codepoint);
- [Obsolete ("Use SKFont directly instead.")]
- public ushort[] GetGlyphs (System.ReadOnlySpan<int> codepoints);
-```
-
-Added methods:
-
-```csharp
-public SKTypeface Clone (SKFontArguments args);
-public SKTypeface Clone (int paletteIndex);
-public SKTypeface Clone (System.ReadOnlySpan<SKFontVariationPositionCoordinate> position);
-public int GetVariationDesignParameters (System.Span<SKFontVariationAxis> axes);
-public int GetVariationDesignPosition (System.Span<SKFontVariationPositionCoordinate> coordinates);
-```
-
-
-#### New Type: SkiaSharp.GRVkYcbcrComponents
-
-```csharp
-public struct GRVkYcbcrComponents, System.IEquatable<GRVkYcbcrComponents> {
-	// properties
-	public uint A { get; set; }
-	public uint B { get; set; }
-	public uint G { get; set; }
-	public uint R { get; set; }
-	// methods
-	public virtual bool Equals (GRVkYcbcrComponents obj);
-	public override bool Equals (object obj);
-	public override int GetHashCode ();
-	public static bool op_Equality (GRVkYcbcrComponents left, GRVkYcbcrComponents right);
-	public static bool op_Inequality (GRVkYcbcrComponents left, GRVkYcbcrComponents right);
-}
-```
-
-#### New Type: SkiaSharp.GRVkYcbcrConversionInfo
-
-```csharp
-public struct GRVkYcbcrConversionInfo, System.IEquatable<GRVkYcbcrConversionInfo> {
-	// properties
-	public uint ChromaFilter { get; set; }
-	public GRVkYcbcrComponents Components { get; set; }
-	public ulong ExternalFormat { get; set; }
-	public uint ForceExplicitReconstruction { get; set; }
-	public uint Format { get; set; }
-	public bool SamplerFilterMustMatchChromaFilter { get; set; }
-	public bool SupportsLinearFilter { get; set; }
-	public uint XChromaOffset { get; set; }
-	public uint YChromaOffset { get; set; }
-	public uint YcbcrModel { get; set; }
-	public uint YcbcrRange { get; set; }
-	// methods
-	public virtual bool Equals (GRVkYcbcrConversionInfo obj);
-	public override bool Equals (object obj);
-	public override int GetHashCode ();
-	public static bool op_Equality (GRVkYcbcrConversionInfo left, GRVkYcbcrConversionInfo right);
-	public static bool op_Inequality (GRVkYcbcrConversionInfo left, GRVkYcbcrConversionInfo right);
-}
-```
-
-#### New Type: SkiaSharp.SKColorspacePrimariesCicp
-
-```csharp
-[Serializable]
-public enum SKColorspacePrimariesCicp {
-	GenericFilm = 8,
-	ItuTH273Value22 = 22,
-	Rec2020 = 9,
-	Rec470SystemBg = 5,
-	Rec470SystemM = 4,
-	Rec601 = 6,
-	Rec709 = 1,
-	SmpteEg4321 = 12,
-	SmpteRp4312 = 11,
-	SmpteSt240 = 7,
-	SmpteSt4281 = 10,
-	Unknown = 0,
-}
-```
-
-#### New Type: SkiaSharp.SKColorspaceTransferFnCicp
-
-```csharp
-[Serializable]
-public enum SKColorspaceTransferFnCicp {
-	Hlg = 18,
-	Iec6196621 = 13,
-	Iec6196624 = 11,
-	Linear = 8,
-	Pq = 16,
-	Rec202010bit = 14,
-	Rec202012bit = 15,
-	Rec470SystemBg = 5,
-	Rec470SystemM = 4,
-	Rec601 = 6,
-	Rec709 = 1,
-	SmpteSt240 = 7,
-	SmpteSt4281 = 17,
-	Unknown = 0,
-}
-```
-
-#### New Type: SkiaSharp.SKDocumentXpsOptions
-
-```csharp
-public struct SKDocumentXpsOptions, System.IEquatable<SKDocumentXpsOptions> {
-	// properties
-	public bool AllowNoPngs { get; set; }
-	public float Dpi { get; set; }
-	// methods
-	public virtual bool Equals (SKDocumentXpsOptions obj);
-	public override bool Equals (object obj);
-	public override int GetHashCode ();
-	public static bool op_Equality (SKDocumentXpsOptions left, SKDocumentXpsOptions right);
-	public static bool op_Inequality (SKDocumentXpsOptions left, SKDocumentXpsOptions right);
-}
-```
-
-#### New Type: SkiaSharp.SKFontArguments
-
-```csharp
-public struct SKFontArguments {
-	// properties
-	public int CollectionIndex { get; set; }
-	public int PaletteIndex { get; set; }
-	public System.ReadOnlySpan<SKFontPaletteOverride> PaletteOverrides { get; set; }
-	public System.ReadOnlySpan<SKFontVariationPositionCoordinate> VariationDesignPosition { get; set; }
-}
-```
-
-#### New Type: SkiaSharp.SKFontPaletteOverride
-
-```csharp
-public struct SKFontPaletteOverride, System.IEquatable<SKFontPaletteOverride> {
-	// properties
-	public uint Color { get; set; }
-	public ushort Index { get; set; }
-	// methods
-	public virtual bool Equals (SKFontPaletteOverride obj);
-	public override bool Equals (object obj);
-	public override int GetHashCode ();
-	public static bool op_Equality (SKFontPaletteOverride left, SKFontPaletteOverride right);
-	public static bool op_Inequality (SKFontPaletteOverride left, SKFontPaletteOverride right);
-}
-```
-
-#### New Type: SkiaSharp.SKFontVariationAxis
-
-```csharp
-public struct SKFontVariationAxis, System.IEquatable<SKFontVariationAxis> {
-	// properties
-	public float Default { get; set; }
-	public bool IsHidden { get; set; }
-	public float Max { get; set; }
-	public float Min { get; set; }
-	public SKFourByteTag Tag { get; set; }
-	// methods
-	public virtual bool Equals (SKFontVariationAxis obj);
-	public override bool Equals (object obj);
-	public override int GetHashCode ();
-	public static bool op_Equality (SKFontVariationAxis left, SKFontVariationAxis right);
-	public static bool op_Inequality (SKFontVariationAxis left, SKFontVariationAxis right);
-}
-```
-
-#### New Type: SkiaSharp.SKFontVariationPositionCoordinate
-
-```csharp
-public struct SKFontVariationPositionCoordinate, System.IEquatable<SKFontVariationPositionCoordinate> {
-	// properties
-	public SKFourByteTag Axis { get; set; }
-	public float Value { get; set; }
-	// methods
-	public virtual bool Equals (SKFontVariationPositionCoordinate obj);
-	public override bool Equals (object obj);
-	public override int GetHashCode ();
-	public static bool op_Equality (SKFontVariationPositionCoordinate left, SKFontVariationPositionCoordinate right);
-	public static bool op_Inequality (SKFontVariationPositionCoordinate left, SKFontVariationPositionCoordinate right);
-}
-```
-
-#### New Type: SkiaSharp.SKFourByteTag
-
-```csharp
-public struct SKFourByteTag, System.IEquatable<SKFourByteTag> {
-	// constructors
-	public SKFourByteTag (uint value);
-	public SKFourByteTag (char c1, char c2, char c3, char c4);
-	// methods
-	public virtual bool Equals (SKFourByteTag other);
-	public override bool Equals (object obj);
-	public override int GetHashCode ();
-	public static SKFourByteTag Parse (string tag);
-	public override string ToString ();
-	public static bool op_Equality (SKFourByteTag left, SKFourByteTag right);
-	public static uint op_Implicit (SKFourByteTag tag);
-	public static SKFourByteTag op_Implicit (uint tag);
-	public static bool op_Inequality (SKFourByteTag left, SKFourByteTag right);
-}
-```
-
-#### New Type: SkiaSharp.SKPathBuilder
-
-```csharp
-public class SKPathBuilder : SkiaSharp.SKObject, System.IDisposable {
-	// constructors
-	public SKPathBuilder ();
-	public SKPathBuilder (SKPath path);
-	// properties
-	public SKPathFillType FillType { get; set; }
-	// methods
-	public void AddArc (SKRect oval, float startAngle, float sweepAngle);
-	public void AddCircle (float x, float y, float radius, SKPathDirection dir);
-	public void AddOval (SKRect rect, SKPathDirection direction);
-	public void AddPath (SKPath other, SKPathAddMode mode);
-	public void AddPath (SKPath other, ref SKMatrix matrix, SKPathAddMode mode);
-	public void AddPath (SKPath other, float dx, float dy, SKPathAddMode mode);
-	public void AddPoly (SKPoint[] points, bool close);
-	public void AddPoly (System.ReadOnlySpan<SKPoint> points, bool close);
-	public void AddRect (SKRect rect, SKPathDirection direction);
-	public void AddRect (SKRect rect, SKPathDirection direction, uint startIndex);
-	public void AddRoundRect (SKRoundRect rect, SKPathDirection direction);
-	public void AddRoundRect (SKRoundRect rect, SKPathDirection direction, uint startIndex);
-	public void AddRoundRect (SKRect rect, float rx, float ry, SKPathDirection dir);
-	public void ArcTo (SKPoint point1, SKPoint point2, float radius);
-	public void ArcTo (SKRect oval, float startAngle, float sweepAngle, bool forceMoveTo);
-	public void ArcTo (SKPoint r, float xAxisRotate, SKPathArcSize largeArc, SKPathDirection sweep, SKPoint xy);
-	public void ArcTo (float x1, float y1, float x2, float y2, float radius);
-	public void ArcTo (float rx, float ry, float xAxisRotate, SKPathArcSize largeArc, SKPathDirection sweep, float x, float y);
-	public void Close ();
-	public void ConicTo (SKPoint point0, SKPoint point1, float w);
-	public void ConicTo (float x0, float y0, float x1, float y1, float w);
-	public void CubicTo (SKPoint point0, SKPoint point1, SKPoint point2);
-	public void CubicTo (float x0, float y0, float x1, float y1, float x2, float y2);
-	public SKPath Detach ();
-	protected override void Dispose (bool disposing);
-	protected override void DisposeNative ();
-	public void LineTo (SKPoint point);
-	public void LineTo (float x, float y);
-	public void MoveTo (SKPoint point);
-	public void MoveTo (float x, float y);
-	public void QuadTo (SKPoint point0, SKPoint point1);
-	public void QuadTo (float x0, float y0, float x1, float y1);
-	public void RArcTo (SKPoint r, float xAxisRotate, SKPathArcSize largeArc, SKPathDirection sweep, SKPoint xy);
-	public void RArcTo (float rx, float ry, float xAxisRotate, SKPathArcSize largeArc, SKPathDirection sweep, float x, float y);
-	public void RConicTo (SKPoint point0, SKPoint point1, float w);
-	public void RConicTo (float dx0, float dy0, float dx1, float dy1, float w);
-	public void RCubicTo (SKPoint point0, SKPoint point1, SKPoint point2);
-	public void RCubicTo (float dx0, float dy0, float dx1, float dy1, float dx2, float dy2);
-	public void RLineTo (SKPoint point);
-	public void RLineTo (float dx, float dy);
-	public void RMoveTo (SKPoint point);
-	public void RMoveTo (float dx, float dy);
-	public void RQuadTo (SKPoint point0, SKPoint point1);
-	public void RQuadTo (float dx0, float dy0, float dx1, float dy1);
-	public void Reset ();
-	public void ReverseAddPath (SKPath other);
-	public SKPath Snapshot ();
-}
-```
-
-#### New Type: SkiaSharp.SKWebpEncoder
-
-```csharp
-public static class SKWebpEncoder {
-	// methods
-	public static SKData Encode (SKPixmap src, SKWebpEncoderOptions options);
-	public static bool Encode (SKWStream dst, SKPixmap src, SKWebpEncoderOptions options);
-	public static bool Encode (System.IO.Stream dst, SKPixmap src, SKWebpEncoderOptions options);
-	public static SKData EncodeAnimated (System.ReadOnlySpan<SKWebpEncoderFrame> frames, SKWebpEncoderOptions options);
-	public static bool EncodeAnimated (SKWStream dst, System.ReadOnlySpan<SKWebpEncoderFrame> frames, SKWebpEncoderOptions options);
-	public static bool EncodeAnimated (System.IO.Stream dst, System.ReadOnlySpan<SKWebpEncoderFrame> frames, SKWebpEncoderOptions options);
-}
-```
-
-#### New Type: SkiaSharp.SKWebpEncoderFrame
-
-```csharp
-public struct SKWebpEncoderFrame {
-	// constructors
-	public SKWebpEncoderFrame (SKBitmap bitmap, System.TimeSpan duration);
-	public SKWebpEncoderFrame (SKImage image, System.TimeSpan duration);
-	public SKWebpEncoderFrame (SKPixmap pixmap, System.TimeSpan duration);
-	// properties
-	public System.TimeSpan Duration { get; set; }
-	public SKPixmap Pixmap { get; set; }
-}
-```
-
-
diff --git a/documentation/docfx/releases/4.148.0/SkiaSharp.Direct3D.Vortice/SkiaSharp.Direct3D.Vortice.md b/documentation/docfx/releases/4.150.0/SkiaSharp.Direct3D.Vortice/SkiaSharp.Direct3D.Vortice.md
similarity index 61%
rename from documentation/docfx/releases/4.148.0/SkiaSharp.Direct3D.Vortice/SkiaSharp.Direct3D.Vortice.md
rename to documentation/docfx/releases/4.150.0/SkiaSharp.Direct3D.Vortice/SkiaSharp.Direct3D.Vortice.md
index fa82cbf21937..4ace1142225e 100644
--- a/documentation/docfx/releases/4.148.0/SkiaSharp.Direct3D.Vortice/SkiaSharp.Direct3D.Vortice.md
+++ b/documentation/docfx/releases/4.150.0/SkiaSharp.Direct3D.Vortice/SkiaSharp.Direct3D.Vortice.md
@@ -2,5 +2,5 @@
 
 ## SkiaSharp.Direct3D.Vortice.dll
 
-> Assembly Version Changed: 4.148.0.0 vs 3.119.0.0
+> Assembly Version Changed: 4.150.0.0 vs 4.148.0.0
 
diff --git a/documentation/docfx/releases/4.150.0/SkiaSharp.HarfBuzz/SkiaSharp.HarfBuzz.md b/documentation/docfx/releases/4.150.0/SkiaSharp.HarfBuzz/SkiaSharp.HarfBuzz.md
new file mode 100644
index 000000000000..9ce00bd9631a
--- /dev/null
+++ b/documentation/docfx/releases/4.150.0/SkiaSharp.HarfBuzz/SkiaSharp.HarfBuzz.md
@@ -0,0 +1,6 @@
+# API diff: SkiaSharp.HarfBuzz.dll
+
+## SkiaSharp.HarfBuzz.dll
+
+> Assembly Version Changed: 4.150.0.0 vs 4.148.0.0
+
diff --git a/documentation/docfx/releases/4.148.0/SkiaSharp.Resources/SkiaSharp.Resources.md b/documentation/docfx/releases/4.150.0/SkiaSharp.Resources/SkiaSharp.Resources.md
similarity index 56%
rename from documentation/docfx/releases/4.148.0/SkiaSharp.Resources/SkiaSharp.Resources.md
rename to documentation/docfx/releases/4.150.0/SkiaSharp.Resources/SkiaSharp.Resources.md
index 5ab909dcd31e..1482c344826d 100644
--- a/documentation/docfx/releases/4.148.0/SkiaSharp.Resources/SkiaSharp.Resources.md
+++ b/documentation/docfx/releases/4.150.0/SkiaSharp.Resources/SkiaSharp.Resources.md
@@ -2,5 +2,5 @@
 
 ## SkiaSharp.Resources.dll
 
-> Assembly Version Changed: 4.148.0.0 vs 3.119.0.0
+> Assembly Version Changed: 4.150.0.0 vs 4.148.0.0
 
diff --git a/documentation/docfx/releases/4.148.0/SkiaSharp.SceneGraph/SkiaSharp.SceneGraph.md b/documentation/docfx/releases/4.150.0/SkiaSharp.SceneGraph/SkiaSharp.SceneGraph.md
similarity index 57%
rename from documentation/docfx/releases/4.148.0/SkiaSharp.SceneGraph/SkiaSharp.SceneGraph.md
rename to documentation/docfx/releases/4.150.0/SkiaSharp.SceneGraph/SkiaSharp.SceneGraph.md
index fa6fea9688a5..3fb766975fe6 100644
--- a/documentation/docfx/releases/4.148.0/SkiaSharp.SceneGraph/SkiaSharp.SceneGraph.md
+++ b/documentation/docfx/releases/4.150.0/SkiaSharp.SceneGraph/SkiaSharp.SceneGraph.md
@@ -2,5 +2,5 @@
 
 ## SkiaSharp.SceneGraph.dll
 
-> Assembly Version Changed: 4.148.0.0 vs 3.119.0.0
+> Assembly Version Changed: 4.150.0.0 vs 4.148.0.0
 
diff --git a/documentation/docfx/releases/4.148.0/SkiaSharp.Skottie/SkiaSharp.Skottie.md b/documentation/docfx/releases/4.150.0/SkiaSharp.Skottie/SkiaSharp.Skottie.md
similarity index 54%
rename from documentation/docfx/releases/4.148.0/SkiaSharp.Skottie/SkiaSharp.Skottie.md
rename to documentation/docfx/releases/4.150.0/SkiaSharp.Skottie/SkiaSharp.Skottie.md
index d7f012e0c820..280df096792b 100644
--- a/documentation/docfx/releases/4.148.0/SkiaSharp.Skottie/SkiaSharp.Skottie.md
+++ b/documentation/docfx/releases/4.150.0/SkiaSharp.Skottie/SkiaSharp.Skottie.md
@@ -2,5 +2,5 @@
 
 ## SkiaSharp.Skottie.dll
 
-> Assembly Version Changed: 4.148.0.0 vs 3.119.0.0
+> Assembly Version Changed: 4.150.0.0 vs 4.148.0.0
 
diff --git a/documentation/docfx/releases/4.148.0/SkiaSharp.Views.Blazor/SkiaSharp.Views.Blazor.md b/documentation/docfx/releases/4.150.0/SkiaSharp.Views.Blazor/SkiaSharp.Views.Blazor.md
similarity index 58%
rename from documentation/docfx/releases/4.148.0/SkiaSharp.Views.Blazor/SkiaSharp.Views.Blazor.md
rename to documentation/docfx/releases/4.150.0/SkiaSharp.Views.Blazor/SkiaSharp.Views.Blazor.md
index 254129cd0245..15dc4fde96ad 100644
--- a/documentation/docfx/releases/4.148.0/SkiaSharp.Views.Blazor/SkiaSharp.Views.Blazor.md
+++ b/documentation/docfx/releases/4.150.0/SkiaSharp.Views.Blazor/SkiaSharp.Views.Blazor.md
@@ -2,5 +2,5 @@
 
 ## SkiaSharp.Views.Blazor.dll
 
-> Assembly Version Changed: 4.148.0.0 vs 3.119.0.0
+> Assembly Version Changed: 4.150.0.0 vs 4.148.0.0
 
diff --git a/documentation/docfx/releases/4.148.0/SkiaSharp.Views.Desktop.Common/SkiaSharp.Views.Desktop.Common.md b/documentation/docfx/releases/4.150.0/SkiaSharp.Views.Desktop.Common/SkiaSharp.Views.Desktop.Common.md
similarity index 63%
rename from documentation/docfx/releases/4.148.0/SkiaSharp.Views.Desktop.Common/SkiaSharp.Views.Desktop.Common.md
rename to documentation/docfx/releases/4.150.0/SkiaSharp.Views.Desktop.Common/SkiaSharp.Views.Desktop.Common.md
index 112ea6037726..f29e56ec0f34 100644
--- a/documentation/docfx/releases/4.148.0/SkiaSharp.Views.Desktop.Common/SkiaSharp.Views.Desktop.Common.md
+++ b/documentation/docfx/releases/4.150.0/SkiaSharp.Views.Desktop.Common/SkiaSharp.Views.Desktop.Common.md
@@ -2,5 +2,5 @@
 
 ## SkiaSharp.Views.Desktop.Common.dll
 
-> Assembly Version Changed: 4.148.0.0 vs 3.119.0.0
+> Assembly Version Changed: 4.150.0.0 vs 4.148.0.0
 
diff --git a/documentation/docfx/releases/4.148.0/SkiaSharp.Views.Gtk3/SkiaSharp.Views.Gtk3.md b/documentation/docfx/releases/4.150.0/SkiaSharp.Views.Gtk3/SkiaSharp.Views.Gtk3.md
similarity index 57%
rename from documentation/docfx/releases/4.148.0/SkiaSharp.Views.Gtk3/SkiaSharp.Views.Gtk3.md
rename to documentation/docfx/releases/4.150.0/SkiaSharp.Views.Gtk3/SkiaSharp.Views.Gtk3.md
index 8c50c725aa30..2bdeaaf0b0ee 100644
--- a/documentation/docfx/releases/4.148.0/SkiaSharp.Views.Gtk3/SkiaSharp.Views.Gtk3.md
+++ b/documentation/docfx/releases/4.150.0/SkiaSharp.Views.Gtk3/SkiaSharp.Views.Gtk3.md
@@ -2,5 +2,5 @@
 
 ## SkiaSharp.Views.Gtk3.dll
 
-> Assembly Version Changed: 4.148.0.0 vs 3.119.0.0
+> Assembly Version Changed: 4.150.0.0 vs 4.148.0.0
 
diff --git a/documentation/docfx/releases/4.148.0/SkiaSharp.Views.Gtk4/SkiaSharp.Views.Gtk4.md b/documentation/docfx/releases/4.150.0/SkiaSharp.Views.Gtk4/SkiaSharp.Views.Gtk4.md
similarity index 57%
rename from documentation/docfx/releases/4.148.0/SkiaSharp.Views.Gtk4/SkiaSharp.Views.Gtk4.md
rename to documentation/docfx/releases/4.150.0/SkiaSharp.Views.Gtk4/SkiaSharp.Views.Gtk4.md
index 006d33985d27..58d859f5409f 100644
--- a/documentation/docfx/releases/4.148.0/SkiaSharp.Views.Gtk4/SkiaSharp.Views.Gtk4.md
+++ b/documentation/docfx/releases/4.150.0/SkiaSharp.Views.Gtk4/SkiaSharp.Views.Gtk4.md
@@ -2,5 +2,5 @@
 
 ## SkiaSharp.Views.Gtk4.dll
 
-> Assembly Version Changed: 4.148.0.0 vs 3.119.0.0
+> Assembly Version Changed: 4.150.0.0 vs 4.148.0.0
 
diff --git a/documentation/docfx/releases/4.148.0/SkiaSharp.Views.Maui.Controls/SkiaSharp.Views.Maui.Controls.md b/documentation/docfx/releases/4.150.0/SkiaSharp.Views.Maui.Controls/SkiaSharp.Views.Maui.Controls.md
similarity index 62%
rename from documentation/docfx/releases/4.148.0/SkiaSharp.Views.Maui.Controls/SkiaSharp.Views.Maui.Controls.md
rename to documentation/docfx/releases/4.150.0/SkiaSharp.Views.Maui.Controls/SkiaSharp.Views.Maui.Controls.md
index 511219467913..e052a65f8a1e 100644
--- a/documentation/docfx/releases/4.148.0/SkiaSharp.Views.Maui.Controls/SkiaSharp.Views.Maui.Controls.md
+++ b/documentation/docfx/releases/4.150.0/SkiaSharp.Views.Maui.Controls/SkiaSharp.Views.Maui.Controls.md
@@ -2,5 +2,5 @@
 
 ## SkiaSharp.Views.Maui.Controls.dll
 
-> Assembly Version Changed: 4.148.0.0 vs 3.119.0.0
+> Assembly Version Changed: 4.150.0.0 vs 4.148.0.0
 
diff --git a/documentation/docfx/releases/4.148.0/SkiaSharp.Views.Maui.Core/SkiaSharp.Views.Maui.Core.md b/documentation/docfx/releases/4.150.0/SkiaSharp.Views.Maui.Core/SkiaSharp.Views.Maui.Core.md
similarity index 60%
rename from documentation/docfx/releases/4.148.0/SkiaSharp.Views.Maui.Core/SkiaSharp.Views.Maui.Core.md
rename to documentation/docfx/releases/4.150.0/SkiaSharp.Views.Maui.Core/SkiaSharp.Views.Maui.Core.md
index 5f15e9fbdbb1..15c03eda3afa 100644
--- a/documentation/docfx/releases/4.148.0/SkiaSharp.Views.Maui.Core/SkiaSharp.Views.Maui.Core.md
+++ b/documentation/docfx/releases/4.150.0/SkiaSharp.Views.Maui.Core/SkiaSharp.Views.Maui.Core.md
@@ -2,5 +2,5 @@
 
 ## SkiaSharp.Views.Maui.Core.dll
 
-> Assembly Version Changed: 4.148.0.0 vs 3.119.0.0
+> Assembly Version Changed: 4.150.0.0 vs 4.148.0.0
 
diff --git a/documentation/docfx/releases/4.148.0/SkiaSharp.Views.Uno.WinUI/SkiaSharp.Views.Windows.md b/documentation/docfx/releases/4.150.0/SkiaSharp.Views.Uno.WinUI/SkiaSharp.Views.Windows.md
similarity index 59%
rename from documentation/docfx/releases/4.148.0/SkiaSharp.Views.Uno.WinUI/SkiaSharp.Views.Windows.md
rename to documentation/docfx/releases/4.150.0/SkiaSharp.Views.Uno.WinUI/SkiaSharp.Views.Windows.md
index 28db2b611bd7..57012ab10832 100644
--- a/documentation/docfx/releases/4.148.0/SkiaSharp.Views.Uno.WinUI/SkiaSharp.Views.Windows.md
+++ b/documentation/docfx/releases/4.150.0/SkiaSharp.Views.Uno.WinUI/SkiaSharp.Views.Windows.md
@@ -2,5 +2,5 @@
 
 ## SkiaSharp.Views.Windows.dll
 
-> Assembly Version Changed: 4.148.0.0 vs 3.119.0.0
+> Assembly Version Changed: 4.150.0.0 vs 4.148.0.0
 
diff --git a/documentation/docfx/releases/4.148.0/SkiaSharp.Views.WPF/SkiaSharp.Views.WPF.md b/documentation/docfx/releases/4.150.0/SkiaSharp.Views.WPF/SkiaSharp.Views.WPF.md
similarity index 56%
rename from documentation/docfx/releases/4.148.0/SkiaSharp.Views.WPF/SkiaSharp.Views.WPF.md
rename to documentation/docfx/releases/4.150.0/SkiaSharp.Views.WPF/SkiaSharp.Views.WPF.md
index 84ac8c1abf2a..fa5dda89ec82 100644
--- a/documentation/docfx/releases/4.148.0/SkiaSharp.Views.WPF/SkiaSharp.Views.WPF.md
+++ b/documentation/docfx/releases/4.150.0/SkiaSharp.Views.WPF/SkiaSharp.Views.WPF.md
@@ -2,5 +2,5 @@
 
 ## SkiaSharp.Views.WPF.dll
 
-> Assembly Version Changed: 4.148.0.0 vs 3.119.0.0
+> Assembly Version Changed: 4.150.0.0 vs 4.148.0.0
 
diff --git a/documentation/docfx/releases/4.148.0/SkiaSharp.Views.WinUI/SkiaSharp.Views.Windows.md b/documentation/docfx/releases/4.150.0/SkiaSharp.Views.WinUI/SkiaSharp.Views.Windows.md
similarity index 59%
rename from documentation/docfx/releases/4.148.0/SkiaSharp.Views.WinUI/SkiaSharp.Views.Windows.md
rename to documentation/docfx/releases/4.150.0/SkiaSharp.Views.WinUI/SkiaSharp.Views.Windows.md
index 28db2b611bd7..57012ab10832 100644
--- a/documentation/docfx/releases/4.148.0/SkiaSharp.Views.WinUI/SkiaSharp.Views.Windows.md
+++ b/documentation/docfx/releases/4.150.0/SkiaSharp.Views.WinUI/SkiaSharp.Views.Windows.md
@@ -2,5 +2,5 @@
 
 ## SkiaSharp.Views.Windows.dll
 
-> Assembly Version Changed: 4.148.0.0 vs 3.119.0.0
+> Assembly Version Changed: 4.150.0.0 vs 4.148.0.0
 
diff --git a/documentation/docfx/releases/4.148.0/SkiaSharp.Views.WindowsForms/SkiaSharp.Views.WindowsForms.md b/documentation/docfx/releases/4.150.0/SkiaSharp.Views.WindowsForms/SkiaSharp.Views.WindowsForms.md
similarity index 62%
rename from documentation/docfx/releases/4.148.0/SkiaSharp.Views.WindowsForms/SkiaSharp.Views.WindowsForms.md
rename to documentation/docfx/releases/4.150.0/SkiaSharp.Views.WindowsForms/SkiaSharp.Views.WindowsForms.md
index cd576d359f4f..10d96b6673ae 100644
--- a/documentation/docfx/releases/4.148.0/SkiaSharp.Views.WindowsForms/SkiaSharp.Views.WindowsForms.md
+++ b/documentation/docfx/releases/4.150.0/SkiaSharp.Views.WindowsForms/SkiaSharp.Views.WindowsForms.md
@@ -2,5 +2,5 @@
 
 ## SkiaSharp.Views.WindowsForms.dll
 
-> Assembly Version Changed: 4.148.0.0 vs 3.119.0.0
+> Assembly Version Changed: 4.150.0.0 vs 4.148.0.0
 
diff --git a/documentation/docfx/releases/4.148.0/SkiaSharp.Views/SkiaSharp.Views.Android.md b/documentation/docfx/releases/4.150.0/SkiaSharp.Views/SkiaSharp.Views.Android.md
similarity index 59%
rename from documentation/docfx/releases/4.148.0/SkiaSharp.Views/SkiaSharp.Views.Android.md
rename to documentation/docfx/releases/4.150.0/SkiaSharp.Views/SkiaSharp.Views.Android.md
index ac25b6be3932..425ebb15b616 100644
--- a/documentation/docfx/releases/4.148.0/SkiaSharp.Views/SkiaSharp.Views.Android.md
+++ b/documentation/docfx/releases/4.150.0/SkiaSharp.Views/SkiaSharp.Views.Android.md
@@ -2,5 +2,5 @@
 
 ## SkiaSharp.Views.Android.dll
 
-> Assembly Version Changed: 4.148.0.0 vs 3.119.0.0
+> Assembly Version Changed: 4.150.0.0 vs 4.148.0.0
 
diff --git a/documentation/docfx/releases/4.148.0/SkiaSharp.Views/SkiaSharp.Views.Mac.md b/documentation/docfx/releases/4.150.0/SkiaSharp.Views/SkiaSharp.Views.Mac.md
similarity index 56%
rename from documentation/docfx/releases/4.148.0/SkiaSharp.Views/SkiaSharp.Views.Mac.md
rename to documentation/docfx/releases/4.150.0/SkiaSharp.Views/SkiaSharp.Views.Mac.md
index 78a5447c8555..fdf513ce56ae 100644
--- a/documentation/docfx/releases/4.148.0/SkiaSharp.Views/SkiaSharp.Views.Mac.md
+++ b/documentation/docfx/releases/4.150.0/SkiaSharp.Views/SkiaSharp.Views.Mac.md
@@ -2,5 +2,5 @@
 
 ## SkiaSharp.Views.Mac.dll
 
-> Assembly Version Changed: 4.148.0.0 vs 3.119.0.0
+> Assembly Version Changed: 4.150.0.0 vs 4.148.0.0
 
diff --git a/documentation/docfx/releases/4.148.0/SkiaSharp.Views/SkiaSharp.Views.Tizen.md b/documentation/docfx/releases/4.150.0/SkiaSharp.Views/SkiaSharp.Views.Tizen.md
similarity index 57%
rename from documentation/docfx/releases/4.148.0/SkiaSharp.Views/SkiaSharp.Views.Tizen.md
rename to documentation/docfx/releases/4.150.0/SkiaSharp.Views/SkiaSharp.Views.Tizen.md
index 7e341bf758db..724caff5c811 100644
--- a/documentation/docfx/releases/4.148.0/SkiaSharp.Views/SkiaSharp.Views.Tizen.md
+++ b/documentation/docfx/releases/4.150.0/SkiaSharp.Views/SkiaSharp.Views.Tizen.md
@@ -2,5 +2,5 @@
 
 ## SkiaSharp.Views.Tizen.dll
 
-> Assembly Version Changed: 4.148.0.0 vs 3.119.0.0
+> Assembly Version Changed: 4.150.0.0 vs 4.148.0.0
 
diff --git a/documentation/docfx/releases/4.148.0/SkiaSharp.Views/SkiaSharp.Views.iOS.md b/documentation/docfx/releases/4.150.0/SkiaSharp.Views/SkiaSharp.Views.iOS.md
similarity index 56%
rename from documentation/docfx/releases/4.148.0/SkiaSharp.Views/SkiaSharp.Views.iOS.md
rename to documentation/docfx/releases/4.150.0/SkiaSharp.Views/SkiaSharp.Views.iOS.md
index e4df2db40fe5..b3ecb3533294 100644
--- a/documentation/docfx/releases/4.148.0/SkiaSharp.Views/SkiaSharp.Views.iOS.md
+++ b/documentation/docfx/releases/4.150.0/SkiaSharp.Views/SkiaSharp.Views.iOS.md
@@ -2,5 +2,5 @@
 
 ## SkiaSharp.Views.iOS.dll
 
-> Assembly Version Changed: 4.148.0.0 vs 3.119.0.0
+> Assembly Version Changed: 4.150.0.0 vs 4.148.0.0
 
diff --git a/documentation/docfx/releases/4.148.0/SkiaSharp.Views/SkiaSharp.Views.tvOS.md b/documentation/docfx/releases/4.150.0/SkiaSharp.Views/SkiaSharp.Views.tvOS.md
similarity index 57%
rename from documentation/docfx/releases/4.148.0/SkiaSharp.Views/SkiaSharp.Views.tvOS.md
rename to documentation/docfx/releases/4.150.0/SkiaSharp.Views/SkiaSharp.Views.tvOS.md
index 82bbacd36d60..37267e2041ca 100644
--- a/documentation/docfx/releases/4.148.0/SkiaSharp.Views/SkiaSharp.Views.tvOS.md
+++ b/documentation/docfx/releases/4.150.0/SkiaSharp.Views/SkiaSharp.Views.tvOS.md
@@ -2,5 +2,5 @@
 
 ## SkiaSharp.Views.tvOS.dll
 
-> Assembly Version Changed: 4.148.0.0 vs 3.119.0.0
+> Assembly Version Changed: 4.150.0.0 vs 4.148.0.0
 
diff --git a/documentation/docfx/releases/4.148.0/SkiaSharp.Vulkan.SharpVk/SkiaSharp.Vulkan.SharpVk.md b/documentation/docfx/releases/4.150.0/SkiaSharp.Vulkan.SharpVk/SkiaSharp.Vulkan.SharpVk.md
similarity index 59%
rename from documentation/docfx/releases/4.148.0/SkiaSharp.Vulkan.SharpVk/SkiaSharp.Vulkan.SharpVk.md
rename to documentation/docfx/releases/4.150.0/SkiaSharp.Vulkan.SharpVk/SkiaSharp.Vulkan.SharpVk.md
index b2a278d62a2c..65cbcabaad64 100644
--- a/documentation/docfx/releases/4.148.0/SkiaSharp.Vulkan.SharpVk/SkiaSharp.Vulkan.SharpVk.md
+++ b/documentation/docfx/releases/4.150.0/SkiaSharp.Vulkan.SharpVk/SkiaSharp.Vulkan.SharpVk.md
@@ -2,5 +2,5 @@
 
 ## SkiaSharp.Vulkan.SharpVk.dll
 
-> Assembly Version Changed: 4.148.0.0 vs 3.119.0.0
+> Assembly Version Changed: 4.150.0.0 vs 4.148.0.0
 
diff --git a/documentation/docfx/releases/4.150.0/SkiaSharp/SkiaSharp.md b/documentation/docfx/releases/4.150.0/SkiaSharp/SkiaSharp.md
new file mode 100644
index 000000000000..796d7f7e5440
--- /dev/null
+++ b/documentation/docfx/releases/4.150.0/SkiaSharp/SkiaSharp.md
@@ -0,0 +1,6 @@
+# API diff: SkiaSharp.dll
+
+## SkiaSharp.dll
+
+> Assembly Version Changed: 4.150.0.0 vs 4.148.0.0
+
diff --git a/documentation/docfx/releases/4.148.0/index.md b/documentation/docfx/releases/4.150.0/index.md
similarity index 94%
rename from documentation/docfx/releases/4.148.0/index.md
rename to documentation/docfx/releases/4.150.0/index.md
index a460258b8de3..a0f1613022c9 100644
--- a/documentation/docfx/releases/4.148.0/index.md
+++ b/documentation/docfx/releases/4.150.0/index.md
@@ -1,10 +1,10 @@
-# API diff: 4.148.0
+# API diff: 4.150.0
 
-> Back to [release notes](../4.148.0.md).
+> Back to [release notes](../4.150.0.md).
 
 ## SkiaSharp
 
-- [SkiaSharp](SkiaSharp/SkiaSharp.md) — ⚠️ breaking
+- [SkiaSharp](SkiaSharp/SkiaSharp.md)
 
 ## SkiaSharp.Direct3D.Vortice
 
diff --git a/documentation/docfx/releases/TOC.yml b/documentation/docfx/releases/TOC.yml
index 3b838e2a89cd..7c00014e6521 100644
--- a/documentation/docfx/releases/TOC.yml
+++ b/documentation/docfx/releases/TOC.yml
@@ -1,5 +1,22 @@
 - name: Overview
   href: index.md
+- name: Version 4.150.x
+  href: 4.150.0.md
+  items:
+    - name: Version 4.150.0 (Unreleased)
+      href: 4.150.0-unreleased.md
+    - name: Version 4.150.0
+      href: 4.150.0.md
+- name: Version 4.148.x
+  href: 4.148.0.md
+  items:
+    - name: Version 4.148.0
+      href: 4.148.0.md
+- name: Version 4.147.x
+  href: 4.147.0.md
+  items:
+    - name: Version 4.147.0
+      href: 4.147.0.md
 - name: Version 3.119.x
   href: 3.119.4.md
   items:
@@ -180,11 +197,18 @@
         - name: Version 1.49.0
           href: 1.49.0.md
 - name: HarfBuzz
-  href: harfbuzzsharp/8.3.1.5.md
+  href: harfbuzzsharp/14.2.0.md
   items:
+    - name: HarfBuzzSharp 14.2.x
+      href: harfbuzzsharp/14.2.0.md
+      items:
+        - name: HarfBuzzSharp 14.2.0
+          href: harfbuzzsharp/14.2.0.md
     - name: HarfBuzzSharp 8.3.x
-      href: harfbuzzsharp/8.3.1.5.md
+      href: harfbuzzsharp/8.3.1.6.md
       items:
+        - name: HarfBuzzSharp 8.3.1.6
+          href: harfbuzzsharp/8.3.1.6.md
         - name: HarfBuzzSharp 8.3.1.5
           href: harfbuzzsharp/8.3.1.5.md
         - name: HarfBuzzSharp 8.3.1.3
diff --git a/documentation/docfx/releases/harfbuzzsharp/14.2.0/HarfBuzzSharp/HarfBuzzSharp.md b/documentation/docfx/releases/harfbuzzsharp/14.2.0/HarfBuzzSharp/HarfBuzzSharp.md
deleted file mode 100644
index c043585d336f..000000000000
--- a/documentation/docfx/releases/harfbuzzsharp/14.2.0/HarfBuzzSharp/HarfBuzzSharp.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# API diff: HarfBuzzSharp.dll
-
-## HarfBuzzSharp.dll
-
-> No changes.
diff --git a/documentation/docfx/releases/harfbuzzsharp/14.2.0/index.md b/documentation/docfx/releases/harfbuzzsharp/14.2.0/index.md
deleted file mode 100644
index 5f6179802e8d..000000000000
--- a/documentation/docfx/releases/harfbuzzsharp/14.2.0/index.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# API diff: 14.2.0
-
-> Back to [release notes](../14.2.0.md).
-
-## HarfBuzzSharp
-
-- [HarfBuzzSharp](HarfBuzzSharp/HarfBuzzSharp.md)
-
diff --git a/documentation/docfx/releases/index.md b/documentation/docfx/releases/index.md
index cf708c7cdd00..ed1bd0c0ff8c 100644
--- a/documentation/docfx/releases/index.md
+++ b/documentation/docfx/releases/index.md
@@ -2,6 +2,16 @@
 
 Release notes for all SkiaSharp versions.
 
+### SkiaSharp 4.x
+
+- **Version 4.150.x**
+  - [Version 4.150.0](4.150.0.md)
+  - [Version 4.150.0 (Unreleased)](4.150.0-unreleased.md)
+- **Version 4.148.x**
+  - [Version 4.148.0](4.148.0.md)
+- **Version 4.147.x**
+  - [Version 4.147.0](4.147.0.md)
+
 ### SkiaSharp 3.x
 
 - **Version 3.119.x**
@@ -93,7 +103,10 @@ Release notes for all SkiaSharp versions.
 
 ### HarfBuzzSharp
 
+- **HarfBuzzSharp 14.2.x**
+  - [HarfBuzzSharp 14.2.0](harfbuzzsharp/14.2.0.md)
 - **HarfBuzzSharp 8.3.x**
+  - [HarfBuzzSharp 8.3.1.6](harfbuzzsharp/8.3.1.6.md)
   - [HarfBuzzSharp 8.3.1.5](harfbuzzsharp/8.3.1.5.md)
   - [HarfBuzzSharp 8.3.1.3](harfbuzzsharp/8.3.1.3.md)
   - [HarfBuzzSharp 8.3.1.2](harfbuzzsharp/8.3.1.2.md)
diff --git a/scripts/infra/shared/api-diff-tools.cake b/scripts/infra/docs/api-diff-tools.cake
similarity index 57%
rename from scripts/infra/shared/api-diff-tools.cake
rename to scripts/infra/docs/api-diff-tools.cake
index 94b37a55f658..b53cee84f17c 100644
--- a/scripts/infra/shared/api-diff-tools.cake
+++ b/scripts/infra/docs/api-diff-tools.cake
@@ -1,6 +1,6 @@
-// READ FIRST: documentation/dev/release-notes-and-changelogs.md is the behavior
-// spec for the API-changelog engine. This file holds the *shared* Cake machinery
-// that both the API-changelog target (.agents/skills/release-notes/scripts/api-diff.cake)
+// READ FIRST: documentation/dev/release-notes-and-api-diffs.md is the behavior
+// spec for the API-diff engine. This file holds the *shared* Cake machinery
+// that both the API-diff target (scripts/infra/docs/api-diff.cake)
 // and the mdoc XML generators (scripts/infra/docs/docs.cake) depend on:
 //
 //   - CreateNuGetDiffAsync : the NuGet-diff comparer factory (+ its dependency loader)
@@ -8,8 +8,9 @@
 //   - versions.json loading : LoadVersionsConfig / IsVersionSuperseded / FindCompareToBaseline
 //
 // Per the spec (§2.1) these are the only pieces shared between the two engines, so
-// they live under shared/ instead of being duplicated. The heavy NuGet-diff #addins
-// live here too, so only the two consumers that #load this file pay for them.
+// they live alongside both consumers here instead of being duplicated. The heavy
+// NuGet-diff #addins live here too, so only the two consumers that #load this file
+// pay for them.
 //
 // CONSUMERS MUST #load "shared.cake" BEFORE this file: it relies on ROOT_PATH,
 // PACKAGE_CACHE_PATH, GetVersion, TRACKED_NUGETS, etc. defined there.
@@ -51,7 +52,27 @@ async Task<NuGetDiff> CreateNuGetDiffAsync()
     // unresolvable identically everywhere and skipping it stays host-independent; it is never
     // part of SkiaSharp's public API, so it contributes nothing to the diff.
     comparer.IgnoreResolutionErrors = true;
-    
+
+    // Exclude auto-generated, non-API classes that the platform tooling compiles INTO the
+    // public view assemblies but that are not part of SkiaSharp's API surface:
+    //   - the Android "aapt" resource designer "<RootNamespace>.Resource" and its nested
+    //     R.* tables (Resource.Drawable, Resource.Styleable, ...), emitted into the
+    //     Android builds of SkiaSharp.Views.Android / .Forms / .Maui.*;
+    //   - the Uno/WinUI XAML "GlobalStaticResources" class emitted into the UWP/WinUI
+    //     builds of SkiaSharp.Views.UWP / .Windows / .Uno.
+    // Without this they surface as thousands of lines of "New Type" resource-id constants
+    // in the diff (e.g. 2600+ lines for a single Forms designer), pure noise that also
+    // varies with platform tooling. IgnoreMemberRegex feeds the formatted-markdown diff's
+    // IgnoreAdded/IgnoreNew/IgnoreRemoved sets, so a match drops the whole type block at
+    // generation time. The patterns are anchored under "SkiaSharp.Views." and require
+    // "Resource"/"GlobalStaticResources" to be a whole trailing name segment, so the real
+    // API lookalikes outside that namespace are untouched (SkiaSharp.Resources.*,
+    // SkiaSharp.GR*TextureResourceInfo). The mdoc engine applies the equivalent exclusion
+    // itself (scripts/infra/docs/docs.cake); this property only affects the api-diff path,
+    // since docs.cake consumes this comparer solely for its SearchPaths.
+    comparer.IgnoreMemberRegex.Add (@"^SkiaSharp\.Views\.[\w.]+\.Resource([.:+/ ]|$)");
+    comparer.IgnoreMemberRegex.Add (@"^SkiaSharp\.Views\.[\w.]+\.GlobalStaticResources([.:+/ ]|$)");
+
     Verbose ($"Adding dependencies...");
 
     await AddDep("OpenTK.GLControl", "NET20");
@@ -110,26 +131,12 @@ async Task<NuGetDiff> CreateNuGetDiffAsync()
     await AddDep("Xamarin.Forms.Platform.GTK", "net45");
     await AddDep("Mono.GtkSharp", "net45");
 
-    // some parts of SkiaSharp depend on other parts
-    foreach (var dir in GetDirectories($"{PACKAGE_CACHE_PATH}/skiasharp/*/lib/netstandard2.0"))
-        comparer.SearchPaths.Add(dir.FullPath);
-    foreach (var dir in GetDirectories($"{PACKAGE_CACHE_PATH}/harfbuzzsharp/*/lib/netstandard2.0"))
-        comparer.SearchPaths.Add(dir.FullPath);
-    foreach (var dir in GetDirectories($"{PACKAGE_CACHE_PATH}/harfbuzzsharp/*/lib/netstandard1.3"))
-        comparer.SearchPaths.Add(dir.FullPath);
-    // SkiaSharp.Views.Maui.Controls depends on SkiaSharp.Views.Maui.Core (our own
-    // package). It ships no netstandard TFM, so add the primary managed build of every
-    // cached Maui.Core version — Mono.Cecil resolves by simple name, so one per version
-    // is enough to satisfy the reference exactly like the self-dependencies above.
-    foreach (var verDir in GetDirectories($"{PACKAGE_CACHE_PATH}/skiasharp.views.maui.core/*")) {
-        foreach (var tfm in new[] { "net10.0", "net9.0", "net8.0", "net7.0", "net6.0" }) {
-            var coreDir = verDir.Combine($"lib/{tfm}");
-            if (DirectoryExists(coreDir)) {
-                comparer.SearchPaths.Add(coreDir.FullPath);
-                break;
-            }
-        }
-    }
+    // Self-dependencies (SkiaSharp parts that reference other SkiaSharp parts — e.g.
+    // SkiaSharp.Views.* → SkiaSharp, SkiaSharp.Views.Maui.Controls → ...Maui.Core) are
+    // NOT added here. They must match the *version being diffed*, not a single global
+    // version, so they are staged per-diff from each package's own nuspec by
+    // StageSelfDepsFromNuspecAsync (see the note on that helper). Adding them globally
+    // here would resolve a 1.x package's inherited types against today's assembly.
 
     Verbose("Added search paths:");
     foreach (var path in comparer.SearchPaths) {
@@ -203,6 +210,149 @@ async Task<NuGetDiff> CreateNuGetDiffAsync()
 }
 
 
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// SELF-DEPENDENCY STAGING (contemporaneous, per-diff)
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
+// A SkiaSharp/HarfBuzz package that derives its public types from another of our packages
+// (e.g. SkiaSharp.Views.* : SKObject in SkiaSharp; SkiaSharp.Views.Maui.Controls →
+// ...Maui.Core) needs that referenced assembly on the resolver's search path. ApiInfo
+// reads a public type's base class FROM the resolved assembly (Mono.Cecil binds by simple
+// name, so whichever build is on the path wins), and uses it to decide which inherited
+// interfaces are public: with SkiaSharp resolved, SKObject's `internal`
+// ISKReferenceCounted/ISKSkipObjectRegistration are hidden and only the public
+// System.IDisposable remains; without it, those internals LEAK into the diff.
+//
+// The version on the path must be the one the package being diffed was actually built
+// against — otherwise a historical (e.g. 1.x) diff is described using today's assembly and
+// can show inherited members the old type never had. So instead of a single global
+// version, stage each self-dependency at the EXACT version pinned in the package's own
+// nuspec. That is contemporaneous, deterministic, and host/cache-independent (nuspec
+// content is frozen). Returns the paths added so the caller removes them after the diff —
+// a self-dep must never leak into the next line. `packageRoot` is the extracted root of
+// the (new-side) package being diffed; the library uses one search-path set for both
+// sides of a diff, and a line's old→new are adjacent same-era releases, so the new side's
+// pin is the correct choice.
+async Task<List<string>> StageSelfDepsFromNuspecAsync(NuGetDiff comparer, string packageRoot)
+{
+    var added = new List<string>();
+    if (string.IsNullOrEmpty(packageRoot))
+        return added;
+    var nuspec = GetFiles($"{packageRoot}/*.nuspec").FirstOrDefault();
+    if (nuspec == null)
+        return added;
+
+    var xdoc = XDocument.Load(nuspec.FullPath);
+    XNamespace ns = xdoc.Root.GetDefaultNamespace();
+
+    // Collect our own dependencies at their pinned minimum version. The same dependency
+    // repeats once per target-framework group, so de-dup by id and keep the lowest pin
+    // (deterministic, and the lowest is the version the package first shipped against).
+    var selfDeps = new Dictionary<string, NuGetVersion>(StringComparer.OrdinalIgnoreCase);
+    foreach (var dep in xdoc.Descendants(ns + "dependency")) {
+        var depId = (string)dep.Attribute("id");
+        if (string.IsNullOrEmpty(depId) || !IsSelfDependency(depId))
+            continue;
+        if (!VersionRange.TryParse((string)dep.Attribute("version") ?? "", out var range) || range.MinVersion == null)
+            continue;
+        if (!selfDeps.TryGetValue(depId, out var existing) || range.MinVersion < existing)
+            selfDeps[depId] = range.MinVersion;
+    }
+
+    foreach (var id in selfDeps.Keys.OrderBy(k => k, StringComparer.OrdinalIgnoreCase)) {
+        var version = selfDeps[id].ToNormalizedString();
+        Verbose($"    Staging self-dependency {id} version {version} (from nuspec)...");
+        try {
+            var root = await comparer.ExtractCachedPackageAsync(id, version);
+            var dir = GetSelfDepLibDirectory(root);
+            if (dir == null) {
+                Verbose($"      no managed build found for {id} {version}");
+                continue;
+            }
+            Verbose($"      lib path {dir}");
+            comparer.SearchPaths.Add(dir);
+            added.Add(dir);
+        } catch (Exception ex) {
+            // A single self-dep that can't be fetched/extracted (e.g. a yanked or
+            // never-published transitive version) must not abort the whole run; the worst
+            // case is that one line cannot resolve that assembly's inherited types.
+            Warning($"      could not stage self-dependency {id} {version}: {ex.Message}");
+        }
+    }
+    return added;
+}
+
+// Remove paths that StageSelfDepsFromNuspecAsync added, restoring the comparer to its
+// shared (third-party only) search-path set before the next line is diffed.
+void UnstageSearchPaths(NuGetDiff comparer, List<string> paths)
+{
+    foreach (var path in paths)
+        comparer.SearchPaths.Remove(path);
+}
+
+// Our own MANAGED packages, identified by id prefix (SkiaSharp*, HarfBuzzSharp*). A package
+// never depends on itself, so this never stages the assembly being diffed (which would
+// shadow it). NativeAssets.* packages are EXCLUDED: they ship only native binaries (no
+// managed assembly), so they contribute nothing to inherited-type resolution, they are by
+// far the largest packages to download, and a missing/preview native build would otherwise
+// abort the whole run for no benefit.
+bool IsSelfDependency(string id) =>
+    (id.StartsWith("SkiaSharp", StringComparison.OrdinalIgnoreCase) ||
+     id.StartsWith("HarfBuzzSharp", StringComparison.OrdinalIgnoreCase)) &&
+    id.IndexOf(".NativeAssets.", StringComparison.OrdinalIgnoreCase) < 0;
+
+// Pick exactly one managed build folder of a self-dependency package to resolve inherited
+// types from. Deterministic ranking: prefer netstandard (newest — the most portable,
+// era-stable surface), then the newest plain .NET, then portable, then the
+// alphabetically-first remaining build; look under lib/ before ref/. One build is enough
+// because Mono.Cecil binds by simple assembly name.
+string GetSelfDepLibDirectory(string packageRoot)
+{
+    foreach (var bucket in new[] { "lib", "ref" }) {
+        var bucketDir = System.IO.Path.Combine(packageRoot, bucket);
+        if (!DirectoryExists(bucketDir))
+            continue;
+
+        DirectoryPath best = null;
+        var bestRank = (tier: -1, version: new System.Version(0, 0), name: (string)null);
+        foreach (var dir in GetDirectories($"{bucketDir}/*")) {
+            if (!GetFiles($"{dir}/*.dll").Any() && !GetFiles($"{dir}/*.winmd").Any())
+                continue;
+
+            var d = dir.GetDirectoryName().ToLower();
+            int tier;
+            System.Version version;
+            var net = System.Text.RegularExpressions.Regex.Match(d, @"^net(\d+\.\d+)$");
+            if (d.StartsWith("netstandard")) {
+                tier = 3;
+                if (!System.Version.TryParse(d.Substring("netstandard".Length), out version))
+                    version = new System.Version(0, 0);
+            } else if (net.Success) {
+                tier = 2;
+                version = System.Version.Parse(net.Groups[1].Value);
+            } else if (d.StartsWith("portable")) {
+                tier = 1;
+                version = new System.Version(0, 0);
+            } else {
+                tier = 0;
+                version = new System.Version(0, 0);
+            }
+
+            if (tier > bestRank.tier
+                || (tier == bestRank.tier && version > bestRank.version)
+                || (tier == bestRank.tier && version == bestRank.version && (bestRank.name == null || string.CompareOrdinal(d, bestRank.name) < 0))) {
+                bestRank = (tier, version, d);
+                best = dir;
+            }
+        }
+
+        if (best != null)
+            return best.FullPath;
+    }
+    return null;
+}
+
+
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // PACKAGE LAYOUT HELPERS
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -226,16 +376,44 @@ IEnumerable<(DirectoryPath path, string platform)> GetPlatformDirectories(Direct
 {
     var platformDirs = GetDirectories($"{rootDir}/*");
 
-    // try find any cross-platform frameworks
+    // A package that ships a cross-platform (BCL) build is documented from that
+    // single assembly. Prefer the newest plain .NET build (e.g. net10.0) because
+    // that is what real apps target and it exposes the most complete API surface;
+    // fall back to netstandard, then portable, only when no plain .NET build exists.
+    DirectoryPath crossPlatformDir = null;
+    var crossPlatformRank = (tier: -1, version: new System.Version (0, 0));
     foreach (var dir in platformDirs) {
         var d = dir.GetDirectoryName().ToLower();
-        if (d.StartsWith("netstandard") || d.StartsWith("portable") || d.Equals("net6.0") || d.Equals("net7.0") || d.Equals("net8.0") || d.Equals("net9.0") || d.Equals("net10.0")) {
-            // we just want this single platform
-            yield return (dir, null);
-            yield break;
+        int tier;
+        System.Version version;
+        // plain .NET (net5.0+); the dot excludes net4x desktop, the anchors exclude platform heads like net10.0-ios
+        var net = System.Text.RegularExpressions.Regex.Match(d, @"^net(\d+\.\d+)$");
+        if (net.Success) {
+            tier = 2;
+            version = System.Version.Parse(net.Groups[1].Value);
+        } else if (d.StartsWith("netstandard")) {
+            tier = 1;
+            if (!System.Version.TryParse(d.Substring("netstandard".Length), out version))
+                version = new System.Version (0, 0);
+        } else if (d.StartsWith("portable")) {
+            tier = 0;
+            version = new System.Version (0, 0);
+        } else {
+            continue;
+        }
+
+        if (tier > crossPlatformRank.tier || (tier == crossPlatformRank.tier && version > crossPlatformRank.version)) {
+            crossPlatformRank = (tier, version);
+            crossPlatformDir = dir;
         }
     }
 
+    if (crossPlatformDir != null) {
+        // we just want this single cross-platform assembly
+        yield return (crossPlatformDir, null);
+        yield break;
+    }
+
     // there were no cross-platform libraries, so process each platform
     foreach (var dir in platformDirs) {
         var d = dir.GetDirectoryName().ToLower();
@@ -318,7 +496,7 @@ bool IsVersionSuperseded (JArray config, string normalizedVersion)
 // and/or a status). Per spec §1.4 rule 2 a tracked line is always EMITTED — it gets
 // its own artifact even when it is a preview-only line behind the latest stable
 // (e.g. the superseded 4.147 / 3.0.0 lines, which are shipped previews that still
-// need their own changelog/page). Matched on major.minor.patch.
+// need their own api diff/page). Matched on major.minor.patch.
 bool IsVersionListed (JArray config, string normalizedVersion)
 {
     var nv = new NuGetVersion (normalizedVersion);
diff --git a/.agents/skills/release-notes/scripts/api-diff.cake b/scripts/infra/docs/api-diff.cake
similarity index 87%
rename from .agents/skills/release-notes/scripts/api-diff.cake
rename to scripts/infra/docs/api-diff.cake
index 16bc38ab366b..2a273ebb1396 100644
--- a/.agents/skills/release-notes/scripts/api-diff.cake
+++ b/scripts/infra/docs/api-diff.cake
@@ -1,8 +1,8 @@
-// READ FIRST: documentation/dev/release-notes-and-changelogs.md is the behavior
+// READ FIRST: documentation/dev/release-notes-and-api-diffs.md is the behavior
 // spec for this engine. Change the spec first, then make this code match it.
 //
 // ─────────────────────────────────────────────────────────────────────────────
-// API-changelog engine (spec §5)
+// API-diff engine (spec §5)
 //
 // This is the Cake half of the release-notes skill. It regenerates the per-family
 // API-diff trees under documentation/docfx/releases/ (spec §3.3/§3.4) by diffing
@@ -18,16 +18,17 @@
 //                         writes only transient output/api-diff, never releases/.
 //
 // Shared machinery (the NuGet-diff comparer, layout helpers, versions.json loading)
-// lives in scripts/infra/shared/api-diff-tools.cake and is #loaded below. The
+// lives alongside this file in scripts/infra/docs/api-diff-tools.cake and is #loaded
+// below. The
 // release-line / baseline / supersession rules are identical to the Python engine
 // (spec §1); see versions.json.
 // ─────────────────────────────────────────────────────────────────────────────
 
-DirectoryPath ROOT_PATH = MakeAbsolute(Directory("../../../.."));
+DirectoryPath ROOT_PATH = MakeAbsolute(Directory("../../.."));
 
-#load "../../../../scripts/infra/shared/shared.cake"
-#load "../../../../scripts/infra/shared/download.cake"
-#load "../../../../scripts/infra/shared/api-diff-tools.cake"
+#load "../shared/shared.cake"
+#load "../shared/download.cake"
+#load "api-diff-tools.cake"
 
 // All committed API diffs live inside the docfx site so docfx renders them and the
 // human pages can link to them with internal links (spec §3).
@@ -113,15 +114,20 @@ Task ("docs-api-diff")
         Debug ($"Version '{latestVersion}' is the baseline for '{id}'...");
 
         // pre-cache so we can have better logs
+        string baselineRoot = null;
         if (!string.IsNullOrEmpty (latestVersion)) {
             Debug ($"Caching version '{latestVersion}' of '{id}'...");
-            await comparer.ExtractCachedPackageAsync (id, latestVersion);
+            baselineRoot = await comparer.ExtractCachedPackageAsync (id, latestVersion);
         }
 
         // generate the diff (current build is a transient CI gate — it writes only
         // output/api-diff, never the committed releases/ tree, spec §5.3)
         Debug ($"Running a diff on '{latestVersion}' vs '{localNugetVersion}' of '{id}'...");
         var diffRoot = $"{baseDir}/{id}";
+        // Stage the baseline's own SkiaSharp/HarfBuzz dependencies (from its nuspec) so
+        // inherited types resolve to the contemporaneous assembly; remove them after.
+        var stagedSelfDeps = await StageSelfDepsFromNuspecAsync (comparer, baselineRoot);
+        try {
         using (var reader = new PackageArchiveReader ($"{OUTPUT_NUGETS_PATH}/{id}.{localNugetVersion}.nupkg")) {
             comparer.MarkdownDiffFileExtension = ".breaking.md";
             comparer.IgnoreNonBreakingChanges = true;
@@ -131,6 +137,9 @@ Task ("docs-api-diff")
             comparer.IgnoreNonBreakingChanges = false;
             await comparer.SaveCompleteDiffToDirectoryAsync (id, latestVersion, reader, diffRoot);
         }
+        } finally {
+            UnstageSearchPaths (comparer, stagedSelfDeps);
+        }
 
         // copy pretty version
         foreach (var md in GetFiles ($"{diffRoot}/*/*.md")) {
@@ -173,7 +182,7 @@ Task ("docs-api-diff-past")
 
     // Include prerelease packages so the active development lines (which ship
     // only as previews/rcs until they go stable, e.g. 4.148/4.150) can be
-    // enumerated. Emission is still collapsed to one changelog per release line
+    // enumerated. Emission is still collapsed to one api diff per release line
     // below — prereleases are needed as candidates, not as their own folders.
     var filter = new NuGetVersions.Filter {
         IncludePrerelease = NUGET_DIFF_PRERELEASE
@@ -197,7 +206,7 @@ Task ("docs-api-diff-past")
         var allVersions = await NuGetVersions.GetAllAsync (id, filter);
 
         // The newest stable release on the feed. It is the cut-off for preview
-        // emission: a preview-only line is only worth a changelog while it is
+        // emission: a preview-only line is only worth an api diff while it is
         // still ahead of the last shipped stable (the active dev line, e.g.
         // 4.148/4.150). Older preview-only lines that never shipped stay pruned.
         var latestStable = allVersions
@@ -208,7 +217,7 @@ Task ("docs-api-diff-past")
         // Collapse the feed into one entry per release LINE, keyed by the numeric
         // version core with the prerelease label stripped (4.148.0-rc.1.2 ->
         // 4.148.0; the 4th digit of a real 4-part stable like 1.49.2.1 is kept).
-        // Each line's changelog is a rollup named by that core, diffed against the
+        // Each line's api diff is a rollup named by that core, diffed against the
         // line's representative package: the newest stable if it shipped,
         // otherwise the newest prerelease. This mirrors the release-notes pages,
         // which are stable-named rollups of all the previews in between.
@@ -221,7 +230,7 @@ Task ("docs-api-diff-past")
             .OrderBy (l => l.rep)
             .ToList ();
 
-        // Decide which lines actually get a changelog emitted (spec §1.4). A line
+        // Decide which lines actually get an api diff emitted (spec §1.4). A line
         // is emitted when ANY of these holds, and not otherwise:
         //   1. it shipped stable (the permanent historical record); or
         //   2. it is listed in versions.json — an intentionally tracked line, e.g. a
@@ -241,7 +250,7 @@ Task ("docs-api-diff-past")
             // The package we actually diff (e.g. 4.148.0-rc.1.2) and the folder we
             // write it to (e.g. 4.148.0).
             var version = emit [idx].rep.ToNormalizedString ();
-            var changelogVersion = emit [idx].key;
+            var apiDiffVersion = emit [idx].key;
 
             // Pick the baseline to diff against (spec §1.3):
             //   1. An explicit compare_to override in versions.json wins
@@ -261,7 +270,7 @@ Task ("docs-api-diff-past")
                 }
             }
 
-            Information ($"Comparing version '{previous}' vs '{version}' of '{id}' (changelog '{changelogVersion}')...");
+            Information ($"Comparing version '{previous}' vs '{version}' of '{id}' (api diff '{apiDiffVersion}')...");
 
             // pre-cache so we can have better logs
             Debug ($"Caching version '{version}' of '{id}'...");
@@ -274,13 +283,22 @@ Task ("docs-api-diff-past")
             // The committed folder for this line: SkiaSharp family -> releases/<line>/<id>/…;
             // HarfBuzz family -> releases/harfbuzzsharp/<hb-line>/<id>/… (spec §3.3/§3.4).
             var lineDir = isHarfBuzz
-                ? RELEASES_PATH.Combine ("harfbuzzsharp").Combine (changelogVersion)
-                : RELEASES_PATH.Combine (changelogVersion);
+                ? RELEASES_PATH.Combine ("harfbuzzsharp").Combine (apiDiffVersion)
+                : RELEASES_PATH.Combine (apiDiffVersion);
 
             // generate the diff and copy to the committed releases/ tree
             Debug ($"Running a diff on '{previous}' vs '{version}' of '{id}'...");
-            var diffRoot = $"{baseDir}/{id}/{changelogVersion}";
-            await RunBreakingAndFullDiff (comparer, id, previous, version, lineDir, diffRoot);
+            var diffRoot = $"{baseDir}/{id}/{apiDiffVersion}";
+            // Stage this package's own SkiaSharp/HarfBuzz dependencies at the versions it
+            // was built against (read from its nuspec) so inherited types resolve to the
+            // contemporaneous assembly, then remove them so they never leak into the next
+            // line (spec §5.2). versionRoot is the new-side extracted package.
+            var stagedSelfDeps = await StageSelfDepsFromNuspecAsync (comparer, versionRoot);
+            try {
+                await RunBreakingAndFullDiff (comparer, id, previous, version, lineDir, diffRoot);
+            } finally {
+                UnstageSearchPaths (comparer, stagedSelfDeps);
+            }
 
             // Record the co-release mapping (spec §1.5/§3.6): the HarfBuzz version
             // that ships with a SkiaSharp line is the HarfBuzzSharp dependency of the
@@ -289,7 +307,7 @@ Task ("docs-api-diff-past")
             if (id == "SkiaSharp.HarfBuzz") {
                 var hbDep = ReadHarfBuzzDependencyLine (versionRoot);
                 if (!string.IsNullOrEmpty (hbDep))
-                    skiaHarfBuzzDeps [changelogVersion] = hbDep;
+                    skiaHarfBuzzDeps [apiDiffVersion] = hbDep;
             }
 
             Debug ($"Diff complete of version '{version}' of '{id}'.");
@@ -328,7 +346,7 @@ Task ("docs-api-diff-past")
 
 // Marker that prefixes the first line of every file the comparer writes (the
 // <assembly>.md / <assembly>.breaking.md diffs and the "No changes." stub in
-// CopyChangelogs). Hand-authored files nested in a line folder do not carry it.
+// CopyApiDiffs). Hand-authored files nested in a line folder do not carry it.
 const string API_DIFF_MARKER = "# API diff:";
 
 // Clear only the GENERATED API-diff files this engine owns (spec §3.5), inside the
@@ -355,16 +373,34 @@ void ClearOwnedApiDiffFolders ()
 
     foreach (var dir in GetSubDirectories (RELEASES_PATH)) {
         var name = dir.GetDirectoryName ();
-        var owned = name == "harfbuzzsharp" || (name.Length > 0 && char.IsDigit (name [0]));
-        if (!owned)
+
+        if (name == "harfbuzzsharp") {
+            // The HarfBuzz family keeps its line folders one level deeper; clear each
+            // line folder individually.
+            foreach (var lineDir in GetSubDirectories (dir)) {
+                var lineKey = lineDir.GetDirectoryName ();
+                if (lineKey.Length > 0 && char.IsDigit (lineKey [0]))
+                    ClearGeneratedApiDiffsIn (lineDir.FullPath);
+            }
+            DeleteEmptyDirectories (dir.FullPath);
             continue;
+        }
 
-        foreach (var md in System.IO.Directory.EnumerateFiles (dir.FullPath, "*.md", System.IO.SearchOption.AllDirectories)) {
-            if (IsGeneratedApiDiff (md))
-                System.IO.File.Delete (md);
+        // SkiaSharp family: a line folder is a top-level directory named by a version core.
+        if (name.Length > 0 && char.IsDigit (name [0])) {
+            ClearGeneratedApiDiffsIn (dir.FullPath);
+            DeleteEmptyDirectories (dir.FullPath);
         }
+    }
+}
 
-        DeleteEmptyDirectories (dir.FullPath);
+// Delete every generated API-diff *.md (see IsGeneratedApiDiff) anywhere under one line
+// folder, leaving hand-authored files in place.
+void ClearGeneratedApiDiffsIn (string lineDir)
+{
+    foreach (var md in System.IO.Directory.EnumerateFiles (lineDir, "*.md", System.IO.SearchOption.AllDirectories)) {
+        if (IsGeneratedApiDiff (md))
+            System.IO.File.Delete (md);
     }
 }
 
@@ -518,7 +554,7 @@ void WriteApiDiffFolderIndex (DirectoryPath lineDir, string line)
 // Copy the generated diff markdown into a line folder: {lineDir}/{id}/{assembly}.md
 // (+ {assembly}.breaking.md), the package-namespaced per-assembly shape of spec
 // §3.3/§3.4. Also mirrors into output/logs/ for build-log inspection (transient).
-void CopyChangelogs (DirectoryPath diffRoot, string id, DirectoryPath lineDir)
+void CopyApiDiffs (DirectoryPath diffRoot, string id, DirectoryPath lineDir)
 {
     foreach (var (path, platform) in GetPlatformDirectories (diffRoot)) {
         // first, make sure to create markdown files for unchanged assemblies
@@ -549,12 +585,12 @@ void CopyChangelogs (DirectoryPath diffRoot, string id, DirectoryPath lineDir)
 
                 dllName += ".breaking";
             }
-            var changelogPath = lineDir.Combine (id).CombineWithFilePath ($"{dllName}.md");
-            EnsureDirectoryExists (changelogPath.GetDirectory ());
-            CopyFile (file, changelogPath);
-            var changelogOutputPath = (FilePath)$"{ROOT_PATH}/output/logs/changelogs/{id}/{lineDir.GetDirectoryName ()}/{dllName}.md";
-            EnsureDirectoryExists (changelogOutputPath.GetDirectory ());
-            CopyFile (file, changelogOutputPath);
+            var apiDiffPath = lineDir.Combine (id).CombineWithFilePath ($"{dllName}.md");
+            EnsureDirectoryExists (apiDiffPath.GetDirectory ());
+            CopyFile (file, apiDiffPath);
+            var apiDiffOutputPath = (FilePath)$"{ROOT_PATH}/output/logs/api-diffs/{id}/{lineDir.GetDirectoryName ()}/{dllName}.md";
+            EnsureDirectoryExists (apiDiffOutputPath.GetDirectory ());
+            CopyFile (file, apiDiffOutputPath);
         }
     }
 }
@@ -562,7 +598,7 @@ void CopyChangelogs (DirectoryPath diffRoot, string id, DirectoryPath lineDir)
 // Run the standard two-pass diff (breaking-only, then full/non-breaking) and copy
 // the resulting markdown into {lineDir}/{id}. The two passes produce the
 // {dll}.breaking.md and {dll}.md files respectively. NEW side is a published feed
-// version. changelogVersion (the line folder) differs from newVersion (the actual
+// version. apiDiffVersion (the line folder) differs from newVersion (the actual
 // package diffed, e.g. 4.148.0-rc.1.2) whenever a line is still in preview.
 async Task RunBreakingAndFullDiff (NuGetDiff comparer, string id, string oldVersion, string newVersion, DirectoryPath lineDir, string diffRoot)
 {
@@ -574,7 +610,7 @@ async Task RunBreakingAndFullDiff (NuGetDiff comparer, string id, string oldVers
     comparer.IgnoreNonBreakingChanges = false;
     await comparer.SaveCompleteDiffToDirectoryAsync (id, oldVersion, newVersion, diffRoot);
 
-    CopyChangelogs (diffRoot, id, lineDir);
+    CopyApiDiffs (diffRoot, id, lineDir);
 }
 
 RunTarget(TARGET);
diff --git a/scripts/infra/docs/docker/Dockerfile b/scripts/infra/docs/docker/Dockerfile
new file mode 100644
index 000000000000..63f57ed345b4
--- /dev/null
+++ b/scripts/infra/docs/docker/Dockerfile
@@ -0,0 +1,60 @@
+# Local-testing image for ALL of SkiaSharp's documentation-generation paths. It exists
+# so a developer can reproduce on any machine exactly what CI produces, without
+# installing mono/python/etc. on the host. CI does NOT use this image: the workflows
+# install the same dependencies natively on their Linux runners and call the very same
+# per-path scripts (scripts/infra/docs/generate-*.sh), so Docker and CI run identical
+# code. This image just mirrors that dependency surface for the three paths:
+#
+#   1. API diffs   — dotnet cake --target=docs-api-diff-past / docs-api-diff
+#   2. Release notes      — python3 scripts/infra/docs/generate-release-notes.py
+#   3. mdoc XML reference docs — dotnet cake --target=update-docs
+#
+# mdoc ships as a .NET Framework executable (scripts/infra/docs/tools/mdoc.*/mdoc.exe).
+# docs.cake runs it under mono on non-Windows hosts, so the mdoc step runs on Linux:
+# this image and any plain Linux CI runner with mono installed run it identically.
+FROM mcr.microsoft.com/dotnet/sdk:10.0
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+# Toolchain:
+#   mono-complete — runtime for mdoc.exe (Path 3)
+#   python3       — release-notes generator (Path 2)
+#   git/curl/unzip/ca-certificates/gnupg — checkout, downloads, package extraction, gh repo key
+#
+# NOTE on GTK#: the managed GTK#/GIR reference assemblies mdoc needs for the
+# SkiaSharp.Views.Gtk* APIs are supplied to mdoc as `--lib` paths by the cake comparer
+# (CreateNuGetDiffAsync adds GtkSharp/GdkSharp/GLibSharp/AtkSharp/Mono.GtkSharp and the
+# GirCore stack from NuGet). That makes resolution host-independent and means we do NOT
+# install a system gtk-sharp2 package (which is unavailable on this Ubuntu base anyway);
+# this is the Linux equivalent of installing the GTK# runtime from an MSI on Windows.
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+        mono-complete \
+        python3 \
+        git \
+        curl \
+        unzip \
+        ca-certificates \
+        gnupg \
+    && rm -rf /var/lib/apt/lists/*
+
+# GitHub CLI — REQUIRED by the release-notes generator for PR author resolution. The
+# pipeline must NOT silently degrade without it; a GITHUB_TOKEN/GH_TOKEN is passed in
+# at run time (see run.sh).
+RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg \
+        -o /usr/share/keyrings/githubcli-archive-keyring.gpg \
+    && chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg \
+    && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" \
+        > /etc/apt/sources.list.d/github-cli.list \
+    && apt-get update \
+    && apt-get install -y --no-install-recommends gh \
+    && rm -rf /var/lib/apt/lists/*
+
+# Fail the build early if any required tool is missing.
+RUN dotnet --version && mono --version | head -1 && python3 --version && gh --version | head -1
+
+WORKDIR /work
+
+# HOME is overridable; default keeps NuGet/dotnet caches in a writable place when the
+# container runs as an arbitrary host UID (run.sh uses -u $(id -u):$(id -g)).
+ENV HOME=/tmp
diff --git a/scripts/infra/docs/docker/run.sh b/scripts/infra/docs/docker/run.sh
new file mode 100755
index 000000000000..6de9aaf3340f
--- /dev/null
+++ b/scripts/infra/docs/docker/run.sh
@@ -0,0 +1,178 @@
+#!/usr/bin/env bash
+#
+# run.sh — run any SkiaSharp documentation-generation step inside the docs Docker image
+# (scripts/infra/docs/docker/Dockerfile) for LOCAL testing. The image mirrors the
+# dependency surface CI installs natively and runs the very same per-path scripts, so a
+# local run reproduces what CI produces. (CI itself does NOT use Docker — its Linux
+# runners install dotnet/mono/python directly and call the same scripts.) The repo is
+# bind-mounted at /work, so externals/package_cache and output/ persist between runs
+# (a "warm" cache). Set COLD=1 to force a fresh, empty package cache for a
+# from-scratch download.
+#
+# The container runs as the host user so every file it writes (regenerated
+# API diffs, docs XML, output/) is owned by you, not root.
+#
+# GitHub auth: GITHUB_TOKEN and GH_TOKEN are forwarded from the host environment.
+# The release-notes generator REQUIRES gh for PR author resolution — it must never
+# silently degrade — so this script errors out for the release-notes path when no
+# token is present (override with ALLOW_NO_TOKEN=1 for the API-only / docs paths).
+#
+# Usage:
+#   run.sh build                       Build (or rebuild) the docker image.
+#   run.sh shell                       Open an interactive shell in the image.
+#
+#   The three documentation-generation paths, each a single canonical script under
+#   scripts/infra/docs/ that local runs, CI, and this wrapper all share:
+#   run.sh api-diffs [args...]         Path 1: API diffs (generate-api-diffs.sh).
+#   run.sh notes [args...]             Path 2: release notes (needs a token).
+#   run.sh api-docs [args...]          Path 3: mdoc XML docs (generate-api-docs.sh).
+#   run.sh all                         All three paths, in order (needs a token).
+#
+#   run.sh cake <target> [args...]     Escape hatch: run an arbitrary cake target.
+#   run.sh exec <command...>           Run an arbitrary command in the container.
+#
+# Environment:
+#   COLD=1            Mount a fresh empty package cache (cold run).
+#   IMAGE=<name>      Override the image tag (default: skiasharp-docs).
+#   ALLOW_NO_TOKEN=1  Permit running without a GitHub token (non-notes paths only).
+#
+set -euo pipefail
+
+IMAGE="${IMAGE:-skiasharp-docs}"
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+REPO_ROOT="$(cd "$SCRIPT_DIR/../../../.." && pwd)"
+
+die() { echo "run.sh: $*" >&2; exit 1; }
+
+build_image() {
+    echo "==> Building $IMAGE from $SCRIPT_DIR/Dockerfile"
+    docker build -t "$IMAGE" "$SCRIPT_DIR"
+}
+
+# Ensure the image exists; build it on first use.
+ensure_image() {
+    if ! docker image inspect "$IMAGE" >/dev/null 2>&1; then
+        echo "==> Image '$IMAGE' not found; building it first."
+        build_image
+    fi
+}
+
+# Assemble the common `docker run` arguments (mounts, user, env, cold-cache overlay)
+# into the global RUN_ARGS array. A global is used instead of a bash 4.3 nameref so the
+# script also runs on the bash 3.2 that ships with macOS.
+RUN_ARGS=()
+docker_run_args() {
+    RUN_ARGS=(
+        --rm
+        -u "$(id -u):$(id -g)"
+        -v "$REPO_ROOT:/work"
+        -w /work
+        -e HOME=/tmp
+    )
+    # Make git history reachable inside the container for WORKTREE checkouts. In a
+    # normal clone, .git is a real directory under /work (already mounted). In a git
+    # worktree, /work/.git is a pointer FILE to a gitdir under the parent repo's .git,
+    # which lives OUTSIDE the mount — so git would be unusable and the release-notes
+    # path (which reads tags/branches/history for PR attribution) would fail. Mount the
+    # git common dir at its own host-absolute path so both the /work/.git pointer and
+    # the worktree's commondir back-link resolve identically inside the container. This
+    # is a no-op for a normal clone (skipped) and for CI (which uses normal clones).
+    if [ -f "$REPO_ROOT/.git" ]; then
+        local common
+        common="$(cd "$REPO_ROOT" && git rev-parse --git-common-dir 2>/dev/null || true)"
+        if [ -n "$common" ] && [ -d "$common" ]; then
+            common="$(cd "$common" && pwd)"
+            RUN_ARGS+=(-v "$common:$common")
+        fi
+    fi
+    # Forward GitHub auth when present (never printed).
+    [ -n "${GITHUB_TOKEN:-}" ] && RUN_ARGS+=(-e "GITHUB_TOKEN=${GITHUB_TOKEN}")
+    [ -n "${GH_TOKEN:-}" ]     && RUN_ARGS+=(-e "GH_TOKEN=${GH_TOKEN}")
+    # Cold cache: bind-mount a fresh, host-owned empty directory over the package
+    # cache so the run downloads everything from scratch while the real warm cache
+    # under externals/package_cache is left untouched. A host-owned bind mount (not a
+    # Docker anonymous volume) is used deliberately: anonymous volumes are created
+    # root-owned, but the container runs as the host user, so it could not write into
+    # them ("Access to the path ... is denied"). The directory lives under the
+    # gitignored output/ tree so it never pollutes the repo.
+    if [ "${COLD:-0}" = "1" ]; then
+        echo "==> COLD run: using a fresh, empty package cache." >&2
+        COLD_CACHE_DIR="$REPO_ROOT/output/cold-cache"
+        rm -rf "$COLD_CACHE_DIR"
+        mkdir -p "$COLD_CACHE_DIR"
+        RUN_ARGS+=(-v "$COLD_CACHE_DIR:/work/externals/package_cache")
+    fi
+}
+
+require_token_for_notes() {
+    if [ -z "${GITHUB_TOKEN:-}" ] && [ -z "${GH_TOKEN:-}" ]; then
+        die "release-notes generation needs a GitHub token (set GITHUB_TOKEN or GH_TOKEN). It must not run without gh auth."
+    fi
+}
+
+cmd="${1:-}"; shift || true
+case "$cmd" in
+    build)
+        build_image
+        ;;
+    shell)
+        ensure_image
+        docker_run_args
+        exec docker run -it "${RUN_ARGS[@]}" "$IMAGE" bash
+        ;;
+    cake)
+        [ $# -ge 1 ] || die "usage: run.sh cake <target> [args...]"
+        ensure_image
+        docker_run_args
+        target="$1"; shift
+        exec docker run "${RUN_ARGS[@]}" "$IMAGE" \
+            bash -lc 'dotnet tool restore && dotnet cake --target="$0" "$@"' "$target" "$@"
+        ;;
+    api-diffs)
+        ensure_image
+        docker_run_args
+        exec docker run "${RUN_ARGS[@]}" "$IMAGE" \
+            scripts/infra/docs/generate-api-diffs.sh "$@"
+        ;;
+    api-docs)
+        ensure_image
+        docker_run_args
+        exec docker run "${RUN_ARGS[@]}" "$IMAGE" \
+            scripts/infra/docs/generate-api-docs.sh "$@"
+        ;;
+    notes)
+        [ "${ALLOW_NO_TOKEN:-0}" = "1" ] || require_token_for_notes
+        ensure_image
+        docker_run_args
+        exec docker run "${RUN_ARGS[@]}" "$IMAGE" \
+            scripts/infra/docs/generate-release-notes.sh "$@"
+        ;;
+    all)
+        # Full local run: all three paths in one container, in dependency order. Path 1
+        # (API diffs) must precede Path 2 (notes) because the release-notes engine
+        # consumes the API diff trees + co-release sidecar Path 1 writes; Path 3
+        # (api-docs) is independent. Sharing one container (and one COLD cache, when set)
+        # means later paths reuse the packages the first path downloaded. Because it runs
+        # the notes path, 'all' requires a token (override with ALLOW_NO_TOKEN=1).
+        [ "${ALLOW_NO_TOKEN:-0}" = "1" ] || require_token_for_notes
+        ensure_image
+        docker_run_args
+        exec docker run "${RUN_ARGS[@]}" "$IMAGE" bash -euo pipefail -c '
+            scripts/infra/docs/generate-api-diffs.sh
+            scripts/infra/docs/generate-release-notes.sh
+            scripts/infra/docs/generate-api-docs.sh
+        '
+        ;;
+    exec)
+        [ $# -ge 1 ] || die "usage: run.sh exec <command...>"
+        ensure_image
+        docker_run_args
+        exec docker run "${RUN_ARGS[@]}" "$IMAGE" "$@"
+        ;;
+    ""|-h|--help|help)
+        sed -n '2,37p' "${BASH_SOURCE[0]}" | sed 's/^# \{0,1\}//'
+        ;;
+    *)
+        die "unknown command '$cmd' (try: build | shell | api-diffs | notes | api-docs | all | cake | exec | help)"
+        ;;
+esac
diff --git a/scripts/infra/docs/docs.cake b/scripts/infra/docs/docs.cake
index 84c6e2ab387b..3a4f7629874c 100644
--- a/scripts/infra/docs/docs.cake
+++ b/scripts/infra/docs/docs.cake
@@ -1,10 +1,10 @@
 // This script holds the mdoc-based docs/ XML generators (docs-update-frameworks,
-// docs-format-docs). The API-changelog engine that used to live here
-// (docs-api-diff / docs-api-diff-past) now lives in the release-notes skill at
-// .agents/skills/release-notes/scripts/api-diff.cake; its behavior spec is
-// documentation/dev/release-notes-and-changelogs.md. The two only share the
+// docs-format-docs). The API-diff engine (docs-api-diff / docs-api-diff-past)
+// lives alongside this file at
+// scripts/infra/docs/api-diff.cake; its behavior spec is
+// documentation/dev/release-notes-and-api-diffs.md. The two only share the
 // NuGet-diff comparer + layout helpers, which live in
-// scripts/infra/shared/api-diff-tools.cake and are #loaded by both.
+// api-diff-tools.cake (alongside this file) and are #loaded by both.
 
 #tool nuget:?package=mdoc&version=5.8.9
 
@@ -15,7 +15,7 @@ DirectoryPath ROOT_PATH = MakeAbsolute(Directory("../../.."));
 
 #load "../shared/shared.cake"
 #load "../shared/download.cake"
-#load "../shared/api-diff-tools.cake"
+#load "api-diff-tools.cake"
 
 // Count every type (including nested) in an assembly. Used to keep the richest
 // build when several TFM folders contribute an assembly with the same file name
@@ -31,6 +31,29 @@ int CountAssemblyTypes (string path)
     }
 }
 
+// mdoc ships as a .NET Framework executable (mdoc.exe). On Windows it runs natively;
+// on Linux/macOS (Linux CI and the local docs Docker image) the very same assembly is
+// launched through mono. Centralising the launch here keeps the docs pipeline
+// host-independent, so the auto-api-docs-writer workflow runs on Linux + mono.
+void RunMdoc (string arguments, DirectoryPath workingDirectory)
+{
+    var mdoc = Context.Tools.Resolve ("mdoc.exe");
+    if (mdoc == null)
+        throw new Exception ("Could not resolve 'mdoc.exe' (the #tool nuget:?package=mdoc restore may have failed).");
+
+    if (IsRunningOnWindows ()) {
+        RunProcess (mdoc, new ProcessSettings {
+            Arguments = arguments,
+            WorkingDirectory = workingDirectory
+        });
+    } else {
+        RunProcess ("mono", new ProcessSettings {
+            Arguments = $"\"{mdoc.FullPath}\" {arguments}",
+            WorkingDirectory = workingDirectory
+        });
+    }
+}
+
 Task ("docs-download-output")
     .Does (async () =>
 {
@@ -95,9 +118,23 @@ Task ("docs-update-frameworks")
         // moniker (all SkiaSharp.Views.Maui.* -> skiasharp-views-maui, the other
         // SkiaSharp.Views.* -> skiasharp-views, ...) so the docs site groups them
         // instead of showing one entry per NuGet package.
-        var dirs =
-            GetPlatformDirectories ($"{packagePath}/lib").Union(
-            GetPlatformDirectories ($"{packagePath}/ref"));
+        //
+        // Document the reference assemblies (ref/) when the package ships them: ref/ is
+        // the canonical public API surface. The implementation assemblies under lib/
+        // also carry members that are excluded from the public contract — notably
+        // [Obsolete(..., error: true)] overloads kept only for binary compatibility,
+        // e.g. the by-value SKCanvas.SetMatrix(SKMatrix) sibling of SetMatrix(in SKMatrix).
+        // mdoc cannot deterministically order such a pair (its member comparer ignores
+        // the by-ref marker, so the two compare equal and an unstable sort swaps them on
+        // every run), which made doc generation non-idempotent: a clean pass produced one
+        // ordering, the next pass the other, with no fixed point. The C# compiler strips
+        // those members from ref/, so documenting ref/ removes the unorderable pair and
+        // makes mdoc idempotent. Only SkiaSharp.dll ships ref/; every other package
+        // is lib-only and falls back to lib/ unchanged.
+        var refDirs = GetPlatformDirectories ($"{packagePath}/ref").ToList ();
+        var dirs = refDirs.Any ()
+            ? refDirs
+            : GetPlatformDirectories ($"{packagePath}/lib").ToList ();
         foreach (var (path, platform) in dirs) {
             string moniker;
             if (id.StartsWith ("SkiaSharp.Views.Maui"))
@@ -160,18 +197,31 @@ Task ("docs-update-frameworks")
     SerializeJsonToPrettyFile (docsJsonPath, docsJson);
 
     // generate doc files. The packages being documented all come from output/nugets
-    // above. The comparer is created here only to supply mdoc's --lib search paths:
-    // the third-party reference assemblies (Microsoft.iOS/macOS/MacCatalyst/tvOS
-    // refs, Maui, GTK, WindowsAppSDK, ...) that SkiaSharp.Views.* assemblies depend
-    // on. mdoc fails hard ("Failed to resolve assembly") without them, and they are
-    // restored into the package cache rather than shipped in output/nugets.
+    // above. The comparer supplies mdoc's --lib search paths for the THIRD-PARTY
+    // reference assemblies (Microsoft.iOS/macOS/MacCatalyst/tvOS refs, Maui, GTK,
+    // WindowsAppSDK, ...) that SkiaSharp.Views.* assemblies depend on; mdoc fails hard
+    // ("Failed to resolve assembly") without them, and they are restored into the
+    // package cache rather than shipped in output/nugets.
     var comparer = await CreateNuGetDiffAsync ();
-    var refArgs = string.Join (" ", comparer.SearchPaths.Select (r => $"--lib=\"{r}\""));
+
+    // The SkiaSharp assemblies also reference EACH OTHER (SkiaSharp.Skottie -> SkiaSharp,
+    // SkiaSharp.Views.* -> SkiaSharp, SkiaSharp.Views.Maui.Controls -> .Maui.Core,
+    // SkiaSharp.HarfBuzz -> HarfBuzzSharp, ...). These self-references must resolve to the
+    // EXACT build being documented (e.g. SkiaSharp 4.150.0.0), so add every staged moniker
+    // directory — the output assemblies laid out above — as a --lib path. This replaces the
+    // old self-dependency glob over every cached NuGet version (removed from
+    // CreateNuGetDiffAsync for determinism, since Mono.Cecil binds by simple name and the
+    // first cached version won): the staged output assemblies are the precise, single,
+    // host-independent set, so mdoc resolves inter-SkiaSharp types deterministically.
+    var selfLibs = GetSubDirectories (docsTempPathFrameowrks)
+        .Select (d => d.FullPath)
+        .OrderBy (p => p, StringComparer.Ordinal);
+    var refArgs = string.Join (" ",
+        comparer.SearchPaths.Concat (selfLibs).Select (r => $"--lib=\"{r}\""));
     var fw = MakeAbsolute ((FilePath) fwxml);
-    RunProcess (Context.Tools.Resolve ("mdoc.exe"), new ProcessSettings {
-        Arguments = $"update --debug --delete --out=\"{DOCS_PATH}\" --lang=DocId --frameworks={fw} {refArgs}",
-        WorkingDirectory = docsTempPathFrameowrks
-    });
+    RunMdoc (
+        $"update --debug --delete --out=\"{DOCS_PATH}\" --lang=DocId --frameworks={fw} {refArgs}",
+        docsTempPathFrameowrks);
 
     // mdoc only ever adds FrameworksIndex/*.xml files; it never deletes the ones for
     // monikers that are no longer generated (e.g. when a package stops being built or
diff --git a/scripts/infra/docs/generate-api-diffs.sh b/scripts/infra/docs/generate-api-diffs.sh
new file mode 100755
index 000000000000..ead00ce15c4c
--- /dev/null
+++ b/scripts/infra/docs/generate-api-diffs.sh
@@ -0,0 +1,45 @@
+#!/usr/bin/env bash
+#
+# generate-api-diffs.sh — Path 1: regenerate the committed API-diff trees.
+#
+# Diffs every published version of each tracked package (SkiaSharp + HarfBuzz
+# families) and writes the per-line, per-package markdown under
+# documentation/docfx/releases/<line>/<pkg>/*.md (+ the harfbuzzsharp/ tree and the
+# co-release sidecar the release-notes engine consumes).
+#
+# Engine: dotnet cake --target=docs-api-diff-past
+#   code:  scripts/infra/docs/api-diff.cake
+#   spec:  documentation/dev/release-notes-and-api-diffs.md   (read this first)
+#
+# This is the single source of truth for Path 1: the release-notes skill's
+# generate.sh, the update-release-notes CI workflow, the docs Docker wrapper
+# (scripts/infra/docs/docker/run.sh api-diffs), and a human running it by hand all
+# call THIS so the command never drifts between local and CI.
+#
+# Usage:
+#   generate-api-diffs.sh [extra cake args...]
+#
+# Requires: dotnet (the SDK pinned in global.json).
+set -euo pipefail
+
+# Repo root is a fixed three levels up from scripts/infra/docs/. Derive it from the
+# script's own location rather than `git rev-parse` so this works everywhere the tree
+# is checked out — including a git WORKTREE bind-mounted into the docs Docker image,
+# where the repo's .git is a pointer file to a gitdir outside the mount (this path
+# reads no git history, so it needs no working .git at all).
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+REPO_ROOT="$(cd "$SCRIPT_DIR/../../.." && pwd)"
+cd "$REPO_ROOT"
+
+if ! command -v dotnet >/dev/null 2>&1; then
+    echo "ERROR: the .NET SDK ('dotnet') is required for the API-diff generator but was not found." >&2
+    echo "       Install the SDK pinned in global.json (or run via scripts/infra/docs/docker/run.sh) and retry." >&2
+    exit 1
+fi
+
+echo "==> Path 1: API diffs (cake docs-api-diff-past) — verbose"
+dotnet tool restore
+# --nugetDiffPrerelease=true: enumerate prerelease packages so active dev lines that
+# ship only as previews/rcs (e.g. 4.148/4.150) can be diffed (spec §5.1). Emission is
+# still collapsed to one api diff per release line inside the target.
+dotnet cake --target=docs-api-diff-past --nugetDiffPrerelease=true "$@"
diff --git a/scripts/infra/docs/generate-api-docs.sh b/scripts/infra/docs/generate-api-docs.sh
new file mode 100755
index 000000000000..4de000be8de1
--- /dev/null
+++ b/scripts/infra/docs/generate-api-docs.sh
@@ -0,0 +1,73 @@
+#!/usr/bin/env bash
+#
+# generate-api-docs.sh — Path 3: regenerate the mdoc XML reference docs.
+#
+# Produces the per-type/per-member XML under docs/SkiaSharpAPI/ (the docs submodule)
+# by running mdoc over the built assemblies. This is the STUB-regeneration half of the
+# auto-api-docs-writer workflow (docs/.github/workflows/auto-api-docs-writer.md); the
+# AI placeholder-fill ("To be added." → prose) is the api-docs skill's separate job and
+# is NOT done here.
+#
+# Steps (mirror the workflow's regenerate-stubs job):
+#   1. dotnet tool restore
+#   2. dotnet cake --target=docs-download-output   populate output/nugets from the CI feed
+#   3. dotnet cake --target=update-docs            mdoc regenerates the XML (+ formats it)
+#
+# mdoc.exe is a .NET Framework executable; docs.cake runs it under mono on non-Windows
+# hosts, so this whole path runs on any host. The auto-api-docs-writer regenerate-stubs
+# job (Linux + mono) and the docs Docker image (scripts/infra/docs/docker/run.sh
+# api-docs) both rely on that.
+#
+# Usage:
+#   generate-api-docs.sh [--skip-download] [extra cake args for update-docs...]
+#
+#   --skip-download   Reuse the existing output/nugets instead of re-downloading (e.g.
+#                     when a local package build already populated it). Errors if empty.
+#
+# Requires: dotnet; mono on non-Windows hosts; network access for the package download.
+set -euo pipefail
+
+# Repo root is a fixed three levels up from scripts/infra/docs/. Derive it from the
+# script's own location rather than `git rev-parse` so this works everywhere the tree
+# is checked out — including a git WORKTREE bind-mounted into the docs Docker image,
+# where the repo's .git is a pointer file to a gitdir outside the mount.
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+REPO_ROOT="$(cd "$SCRIPT_DIR/../../.." && pwd)"
+cd "$REPO_ROOT"
+
+skip_download=0
+cake_args=()
+while [ $# -gt 0 ]; do
+    case "$1" in
+        --skip-download) skip_download=1; shift ;;
+        *)               cake_args+=("$1"); shift ;;
+    esac
+done
+
+if ! command -v dotnet >/dev/null 2>&1; then
+    echo "ERROR: the .NET SDK ('dotnet') is required for the API-docs generator but was not found." >&2
+    echo "       Install the SDK pinned in global.json (or run via scripts/infra/docs/docker/run.sh) and retry." >&2
+    exit 1
+fi
+case "$(uname -s)" in
+    MINGW*|MSYS*|CYGWIN*|Windows_NT) ;;  # Windows: mdoc.exe runs natively
+    *)
+        if ! command -v mono >/dev/null 2>&1; then
+            echo "ERROR: 'mono' is required to run mdoc.exe on non-Windows hosts but was not found." >&2
+            echo "       Install mono (or run via scripts/infra/docs/docker/run.sh) and retry." >&2
+            exit 1
+        fi ;;
+esac
+
+echo "==> Path 3: mdoc XML docs — verbose"
+dotnet tool restore
+
+if [ "$skip_download" = 1 ]; then
+    echo "==> [1/2] Skipping docs-download-output (--skip-download); reusing output/nugets."
+else
+    echo "==> [1/2] Downloading CI packages (cake docs-download-output)"
+    dotnet cake --target=docs-download-output
+fi
+
+echo "==> [2/2] Regenerating XML docs (cake update-docs)"
+dotnet cake --target=update-docs "${cake_args[@]}"
diff --git a/.agents/skills/release-notes/scripts/generate-release-notes.py b/scripts/infra/docs/generate-release-notes.py
similarity index 99%
rename from .agents/skills/release-notes/scripts/generate-release-notes.py
rename to scripts/infra/docs/generate-release-notes.py
index 9ebff8f398c9..ed44758a12b8 100644
--- a/.agents/skills/release-notes/scripts/generate-release-notes.py
+++ b/scripts/infra/docs/generate-release-notes.py
@@ -2,8 +2,8 @@
 """
 Fetch SkiaSharp release data and manage the website release notes structure.
 
-READ FIRST: documentation/dev/release-notes-and-changelogs.md is the behavior
-SPEC for this script (and the sibling API-changelog cake target). Change the spec
+READ FIRST: documentation/dev/release-notes-and-api-diffs.md is the behavior
+SPEC for this script (and the sibling API-diff cake target). Change the spec
 first, then make this code match it — do not patch new behavior in and leave the
 spec stale.
 
@@ -193,9 +193,9 @@ def _versions_config_lookup(version, family="skiasharp"):
     return None
 
 
-# Co-release map sidecar (spec §3.6), written by the Cake API-changelog engine and
+# Co-release map sidecar (spec §3.6), written by the Cake API-diff engine and
 # read here to emit the deterministic SkiaSharp-page -> HarfBuzz-folder link. It is
-# the ONLY thing that crosses from the API-changelog engine into this engine
+# the ONLY thing that crosses from the API-diff engine into this engine
 # (spec §2.2). Absent sidecar (e.g. Cake not yet run) -> no HarfBuzz link, no error.
 _CO_RELEASE_MAP = None  # type: Optional[dict]
 
@@ -867,7 +867,7 @@ def version_from_branch(branch):
 #     [Full Changelog](.../compare/v3.119.2-preview.2.3...v3.119.2-preview.3.1)
 #
 # SKILL.md rules 9/10 still mandate this ("Rollup at top … Previews are minimal:
-# one sentence + changelog link each, at the bottom"). When pages were migrated
+# one sentence + Full Changelog link each, at the bottom"). When pages were migrated
 # to the script (#4174) these sections were lost, because the script never told
 # the AI which previews existed. We restore the feature by enumerating the
 # previews DETERMINISTICALLY here and emitting them into the raw-data block.
@@ -2274,7 +2274,7 @@ def _write_harfbuzz_page(hb, all_branches, force=False):
     hb_line = hb["hb_line"]
     canonical_skia = hb["canonical_skia"]
     hb_dir = RELEASES_DIR / "harfbuzzsharp"
-    # A HarfBuzz line is "published" (released) exactly when the API-changelog
+    # A HarfBuzz line is "published" (released) exactly when the API-diff
     # engine emitted its diff folder; otherwise it is in-flight (spec §3.4/§4.5).
     published = (hb_dir / hb_line).is_dir()
 
diff --git a/scripts/infra/docs/generate-release-notes.sh b/scripts/infra/docs/generate-release-notes.sh
new file mode 100755
index 000000000000..0c5b7871203c
--- /dev/null
+++ b/scripts/infra/docs/generate-release-notes.sh
@@ -0,0 +1,55 @@
+#!/usr/bin/env bash
+#
+# generate-release-notes.sh — Path 2: regenerate the human release-notes prose.
+#
+# Runs the deterministic Python release-notes engine, which turns the committed
+# api diff trees + co-release sidecar (produced by Path 1) into the per-line human
+# pages and raw data under documentation/docfx/releases/. For a full refresh, run
+# generate-api-diffs.sh (Path 1) FIRST so the api diff inputs are current.
+#
+# Engine: python3 scripts/infra/docs/generate-release-notes.py
+#   spec:  documentation/dev/release-notes-and-api-diffs.md   (read this first)
+#
+# Single source of truth for Path 2: the release-notes skill's generate.sh, CI, the
+# docs Docker wrapper (run.sh notes), and a human all call THIS.
+#
+# Usage:
+#   generate-release-notes.sh [args...]          (default scope: --all)
+#
+#   <args> are forwarded verbatim to generate-release-notes.py, replacing the default
+#   --all (e.g. --branch main, a version, --polish-list <path>, ...).
+#
+# Requires: python3. The generator uses the GitHub CLI ('gh') to resolve PR authors;
+# export GITHUB_TOKEN or GH_TOKEN so it can authenticate (CI passes one through).
+set -euo pipefail
+
+# Repo root is a fixed three levels up from scripts/infra/docs/. Derive it from the
+# script's own location rather than `git rev-parse` so this works everywhere the tree
+# is checked out — including a git WORKTREE bind-mounted into the docs Docker image,
+# where the repo's .git is a pointer file to a gitdir outside the mount. The Python
+# generator DOES read git history (for PR authors), so a real .git must still be
+# reachable when this path is run for real; deriving the root this way just removes a
+# hard dependency on `git rev-parse` for locating the tree.
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+REPO_ROOT="$(cd "$SCRIPT_DIR/../../.." && pwd)"
+cd "$REPO_ROOT"
+
+PY_GENERATOR="$SCRIPT_DIR/generate-release-notes.py"
+
+if ! command -v python3 >/dev/null 2>&1; then
+    echo "ERROR: 'python3' is required for the release-notes generator but was not found." >&2
+    echo "       Install Python 3 (or run via scripts/infra/docs/docker/run.sh) and retry." >&2
+    exit 1
+fi
+if [ ! -f "$PY_GENERATOR" ]; then
+    echo "ERROR: release-notes generator not found at $PY_GENERATOR" >&2
+    exit 1
+fi
+
+# Default scope: regenerate every branch.
+if [ "$#" -eq 0 ]; then
+    set -- --all
+fi
+
+echo "==> Path 2: release notes (generate-release-notes.py $*) — verbose"
+python3 "$PY_GENERATOR" "$@"
diff --git a/scripts/infra/docs/pr-authors.json b/scripts/infra/docs/pr-authors.json
index ff932ece90ad..1229b3b9170a 100644
--- a/scripts/infra/docs/pr-authors.json
+++ b/scripts/infra/docs/pr-authors.json
@@ -923,7 +923,12 @@
   "4174": "mattleibow",
   "4177": "mattleibow",
   "4179": "mattleibow",
+  "4184": "mattleibow",
   "4185": "mattleibow",
   "4186": "mattleibow",
-  "4188": "mattleibow"
+  "4188": "mattleibow",
+  "4192": "mattleibow",
+  "4193": "mattleibow",
+  "4196": "mattleibow",
+  "4197": "mattleibow"
 }
diff --git a/scripts/infra/docs/versions.json b/scripts/infra/docs/versions.json
index 3eafb9bdc19f..24cbe9e9e6d4 100644
--- a/scripts/infra/docs/versions.json
+++ b/scripts/infra/docs/versions.json
@@ -1,5 +1,5 @@
 {
-  "$comment": "Shared version-comparison overrides for API changelogs AND release notes. See documentation/dev/release-notes-and-changelogs.md (the behavior spec). OVERRIDE-ONLY: list a line only when it needs a non-default comparison baseline (compare_to) or is superseded (status + superseded_by), or to force emission of a never-stable line. The default baseline is the previous emitted line; the inverse 'supersedes' back-link is DERIVED from superseded_by and must not be set here. Top level is keyed by FAMILY (spec 1.5): 'skiasharp' for SkiaSharp-versioned packages and 'harfbuzzsharp' for HarfBuzzSharp-versioned packages. Each family is then keyed by line core (X.Y.Z).",
+  "$comment": "Shared version-comparison overrides for API diffs AND release notes. See documentation/dev/release-notes-and-api-diffs.md (the behavior spec). OVERRIDE-ONLY: list a line only when it needs a non-default comparison baseline (compare_to) or is superseded (status + superseded_by), or to force emission of a never-stable line. The default baseline is the previous emitted line; the inverse 'supersedes' back-link is DERIVED from superseded_by and must not be set here. Top level is keyed by FAMILY (spec 1.5): 'skiasharp' for SkiaSharp-versioned packages and 'harfbuzzsharp' for HarfBuzzSharp-versioned packages. Each family is then keyed by line core (X.Y.Z).",
   "skiasharp": {
     "3.0.0": {
       "status": "superseded",