From 0fb35d9781f715b8f7d312de38ff59ac77faf58b Mon Sep 17 00:00:00 2001 From: Nick Cipollina Date: Wed, 22 Jul 2026 15:10:30 -0400 Subject: [PATCH 1/5] ci(github): use app token for dependabot merges --- .github/workflows/dependabot-auto-merge.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml index 9a86844d..70fb018f 100644 --- a/.github/workflows/dependabot-auto-merge.yml +++ b/.github/workflows/dependabot-auto-merge.yml @@ -19,16 +19,24 @@ jobs: with: github-token: "${{ secrets.GITHUB_TOKEN }}" + - name: Generate app token + id: app-token + if: steps.metadata.outputs.update-type == 'version-update:semver-patch' || steps.metadata.outputs.update-type == 'version-update:semver-minor' + uses: actions/create-github-app-token@fee1f7d63c2ff003460e3d139729b119787bc349 # v2 + with: + app-id: ${{ secrets.DEPENDABOT_AUTOMERGE_APP_ID }} + private-key: ${{ secrets.DEPENDABOT_AUTOMERGE_PRIVATE_KEY }} + - name: Approve PR if: steps.metadata.outputs.update-type == 'version-update:semver-patch' || steps.metadata.outputs.update-type == 'version-update:semver-minor' run: gh pr review --approve "$PR_URL" env: PR_URL: ${{ github.event.pull_request.html_url }} - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GH_TOKEN: ${{ steps.app-token.outputs.token }} - name: Enable auto-merge for Dependabot PRs if: steps.metadata.outputs.update-type == 'version-update:semver-patch' || steps.metadata.outputs.update-type == 'version-update:semver-minor' run: gh pr merge --auto --squash "$PR_URL" env: PR_URL: ${{ github.event.pull_request.html_url }} - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GH_TOKEN: ${{ steps.app-token.outputs.token }} From 0345a83d7eb86fc15643d3eabe2a8be702dbe2b5 Mon Sep 17 00:00:00 2001 From: Nick Cipollina Date: Wed, 22 Jul 2026 15:18:07 -0400 Subject: [PATCH 2/5] ci(github): use bracket notation for app token --- .github/workflows/dependabot-auto-merge.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml index 70fb018f..6b506373 100644 --- a/.github/workflows/dependabot-auto-merge.yml +++ b/.github/workflows/dependabot-auto-merge.yml @@ -32,11 +32,11 @@ jobs: run: gh pr review --approve "$PR_URL" env: PR_URL: ${{ github.event.pull_request.html_url }} - GH_TOKEN: ${{ steps.app-token.outputs.token }} + GH_TOKEN: ${{ steps['app-token'].outputs.token }} - name: Enable auto-merge for Dependabot PRs if: steps.metadata.outputs.update-type == 'version-update:semver-patch' || steps.metadata.outputs.update-type == 'version-update:semver-minor' run: gh pr merge --auto --squash "$PR_URL" env: PR_URL: ${{ github.event.pull_request.html_url }} - GH_TOKEN: ${{ steps.app-token.outputs.token }} + GH_TOKEN: ${{ steps['app-token'].outputs.token }} From 4e26be508ba957fd705157ea0aeba518df9fa737 Mon Sep 17 00:00:00 2001 From: Nick Cipollina Date: Wed, 22 Jul 2026 15:49:22 -0400 Subject: [PATCH 3/5] chore(deps): align EF Core package versions --- Directory.Packages.props | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 7539fc17..c2a2ff55 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -7,15 +7,15 @@ - - + + - + @@ -28,9 +28,9 @@ - 11.0.0-preview.5.26302.115 + [11.0.0-preview.6.26359.118, 12.0.0-1) - 10.0.9 + [10.0.10, 11.0.0) @@ -39,17 +39,17 @@ - - - - - + + + + + - - - - - + + + + + \ No newline at end of file From 5f21ae0167cfeb6bba2066dabe3c87dd3486fc8a Mon Sep 17 00:00:00 2001 From: Nick Cipollina Date: Wed, 22 Jul 2026 15:53:07 -0400 Subject: [PATCH 4/5] chore(deps): keep EF11 on published preview --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index c2a2ff55..2ebb91dd 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -28,7 +28,7 @@ - [11.0.0-preview.6.26359.118, 12.0.0-1) + [11.0.0-preview.5.26302.115, 12.0.0-a) [10.0.10, 11.0.0) From 7b6103f8a8768d078721f3c05a032ef7a98d839c Mon Sep 17 00:00:00 2001 From: Nick Cipollina Date: Wed, 22 Jul 2026 15:59:47 -0400 Subject: [PATCH 5/5] chore(deps): use bounded Microsoft Extensions ranges --- Directory.Packages.props | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 2ebb91dd..7b2ee2de 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -39,17 +39,17 @@ - - - - - + + + + + - - - - - + + + + + \ No newline at end of file