Skip to content

Point Dependabot at dev, and sync main back into dev - #409

Merged
erikdarlingdata merged 55 commits into
devfrom
fix/dependabot-target-dev
Jul 25, 2026
Merged

Point Dependabot at dev, and sync main back into dev#409
erikdarlingdata merged 55 commits into
devfrom
fix/dependabot-target-dev

Conversation

@erikdarlingdata

Copy link
Copy Markdown
Owner

Fixes a mistake in the Dependabot config I added in #399, and repairs its consequence.

What went wrong

.github/dependabot.yml did not set target-branch. Dependabot therefore defaults to the repository's default branch, which here is main.

So its first two PRs (#407, #408) were opened against main, not dev. I merged them without checking the base, which:

  • put dependency bumps directly onto main, bypassing the dev -> main release flow
  • left dev behind main, which would have surfaced later as a confusing conflict on the next release PR

That is on me - the base branch is right there in the PR and I did not look at it.

Fix

Both ecosystem entries now set target-branch: dev, with a comment explaining why it has to stay. Future Dependabot PRs will target dev and follow the normal flow.

Sync

This branch also merges main back into dev, so dev is no longer missing the two bumps:

  • SQLitePCLRaw.bundle_e_sqlite3 3.0.4
  • Meziantou.Framework.Win32.CredentialManager 3.0.1

The merge was clean - no conflicts.

What was not affected

Both bumps were verified before merging, and that work stands:

  • CredentialManager 3.0.1 - full round-trip against Windows Credential Manager (write, enumerate, read-back, delete, confirm-gone). Worth noting SaveCredential/DeleteCredential swallow exceptions, so a broken major would have compiled and then silently failed to save credentials; the round-trip is what rules that out.
  • SQLitePCLRaw 3.0.4 - PlanShare run locally and exercised end-to-end (stats aggregates, insert, select round-trip, parameterized delete, 404-after-delete), and it bundles SQLite 3.53.3, so CVE-2025-6965 stays fixed.

And the accidental merge to main did have one genuinely good outcome: it triggered the new PlanShare auto-deploy for real. Production is now on SQLite 3.53.3, service active, api/stats returning 200, binary timestamped 21:49 UTC. The deploy automation is validated end-to-end on its first real trigger.

Test plan

  • dependabot.yml parses; both entries report target-branch: dev
  • Clean Debug build: 0 warnings
  • 288/288 tests pass
  • Verified on the live server that the deployed SQLite is 3.53.3 and the service is healthy

🤖 Generated with Claude Code

erikdarlingdata and others added 30 commits April 7, 2026 11:43
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Uses the Darling Data barbell logo as hero image when shared on
social media. Also adds meta description for SEO.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Add Open Graph meta tags for social sharing
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Merge dev: HTML export for plan analysis (#182)
This reason means something in the query blocks parallelism (scalar UDFs,
table variable inserts, etc.) — that's worth a Warning, not Info.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Fix Rule 3: CouldNotGenerateValidParallelPlan stays Warning
Adds human-readable messages for all 25 known reasons. Severity:
- Warning: actionable reasons (UDFs, cursors, table variables, remote
  queries, trace flags, hints, DML OUTPUT, writeback variables)
- Info: passive/environmental (cost below threshold, edition limits,
  memory-optimized tables, upgrade mode, index build edge cases)

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Expand Rule 3 to cover all NonParallelPlanReason values
Merge dev: plan sharing and export (#182)
Merge dev to main (v1.4.3 + logo fix)
Merge dev: HTTPS plan sharing API
Release: issue #178 round 3 feedback (items 17-25)
Release v1.5.0 — maximum benefit scoring
Release: analytics for Plan Analyzer web app
Merge dev to main — Joe #215 feedback through b1/b7
Release v1.7.0 — wait stats as warnings
Release v1.7.1 — render benefit % and actionable fix
Release v1.7.2 — operator self-time fix + decimal benefit %
Release v1.7.3 — visible web viewer version
Release v1.7.4 — external-wait formula + CPU:Elapsed adjustment
erikdarlingdata and others added 24 commits April 23, 2026 11:27
Release v1.7.7 — D3 content strip + legacy marker + drop Rule 21
Release v1.7.8 — batch-mode pipelined self-time (#215 D1)
Release v1.8.0 — Joe feedback E1-E12 batch
Release: web parallelism icons, SSMS extension, connect-dialog DB, hardening
Release v1.15.0 - Query Store colorblind-safe palette
Release v1.16.0 - Query Store search and filtering
---
updated-dependencies:
- dependency-name: SQLitePCLRaw.bundle_e_sqlite3
  dependency-version: 3.0.4
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
…3.0.1

---
updated-dependencies:
- dependency-name: Meziantou.Framework.Win32.CredentialManager
  dependency-version: 3.0.1
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
…nViewer.App/Meziantou.Framework.Win32.CredentialManager-3.0.1

deps: Bump Meziantou.Framework.Win32.CredentialManager from 2.0.1 to 3.0.1
The comment said "remove this once its floor reaches 2.1.12+", which is
stale now that the ref is on the 3.x line. Microsoft.Data.Sqlite 10.0.10
still floors its transitive at the vulnerable 2.1.11, so this direct ref
is still what keeps the native library patched.

Records what was verified: 3.0.4 bundles SQLite 3.53.3 (past the 3.50.2
CVE fix), and Microsoft.Data.Sqlite 10.0.10 works against the 3.x native
layer - stats aggregates, insert, select round-trip, parameterized
delete, and 404-after-delete all exercised against a running instance.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
…PlanShare/SQLitePCLRaw.bundle_e_sqlite3-3.0.4

deps: Bump SQLitePCLRaw.bundle_e_sqlite3 from 2.1.12 to 3.0.4
Two related fixes for a mistake in the original Dependabot config.

target-branch was not set, so Dependabot defaulted to the repository's
default branch - main. Its first two PRs (#407, #408) were therefore
opened against main rather than dev, and merging them put dependency
bumps directly onto main, bypassing the dev -> main release flow and
leaving dev behind. Both entries now set target-branch: dev, with a
comment explaining why it must stay.

This branch also merges main back into dev so dev is no longer missing
those bumps: SQLitePCLRaw.bundle_e_sqlite3 3.0.4 and
Meziantou.Framework.Win32.CredentialManager 3.0.1. Merge was clean.

Verified: clean Debug build 0 warnings, 288/288 tests pass.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
@claude

claude Bot commented Jul 25, 2026

Copy link
Copy Markdown

Reviewed. This is a small, config-only PR (dependabot fix + sync of two already-shipped dependency bumps) — none of the usual plan-XML / T-SQL / PlanViewer.Ssms-version concerns apply here since no code paths for that were touched.

Checked and looks correct:

  • Both dependabot.yml entries (nuget and github-actions) now set target-branch: dev, with a comment explaining why — fixes the root cause (Dependabot PRs were landing on main, the repo's default branch).
  • Meziantou.Framework.Win32.CredentialManager 3.0.1 is bumped consistently in both projects that reference it (PlanViewer.App, PlanViewer.Core) — no strays left on 2.0.1.
  • SQLitePCLRaw.bundle_e_sqlite3 3.0.4 is only referenced from server/PlanShare/PlanShare.csproj, and it's updated there; the inline comment explaining the pin is updated to match the new version/rationale (CVE-2025-6965 fix, SQLite 3.53.3).
  • src/Directory.Build.props version correctly stays untouched — this isn't a feature/release PR, just a dependency-floor bump + CI config fix, so no version bump is expected here.
  • No NoWarn additions, no new T-SQL, no PlanViewer.Web linked-file changes needed — out of scope for this diff.

No issues found. The one soft risk (skipped version verification round-trips for the two bumps) is addressed in the PR description rather than in code, which is fine for a config-only change like this.

@erikdarlingdata
erikdarlingdata merged commit fd00422 into dev Jul 25, 2026
3 checks passed
@erikdarlingdata
erikdarlingdata deleted the fix/dependabot-target-dev branch July 25, 2026 22:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant