-
Notifications
You must be signed in to change notification settings - Fork 32
Merge latest from Library.Template #387
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
22 commits
Select commit
Hold shift + click to select a range
5029057
Update Microsoft Testing Platform to 2.2.3 (517)
renovate[bot] 8b81322
Merge remote-tracking branch 'origin/main' into microbuild
AArnott f24b9f1
Update dependency Microsoft.Testing.Extensions.CodeCoverage to 18.7.0…
renovate[bot] 1de022c
Update dependency dotnet-coverage to v18.7.0 (518)
renovate[bot] 39a5c36
Merge remote-tracking branch 'origin/main' into microbuild
AArnott caa057e
Update mcr.microsoft.com/dotnet/sdk:10.0.300 Docker digest to c079063…
renovate[bot] 3fd37fb
Merge remote-tracking branch 'origin/main' into microbuild
AArnott e7468d6
Update dependency powershell to v7.6.2 (#521)
renovate[bot] 08ad1de
Update dependency PolySharp to 1.16.0 (#522)
renovate[bot] 3bdfd03
Fix Install-DotNetSdk.ps1 hang from recursive Directory.Build.props s…
drognanar 8e28503
Merge remote-tracking branch 'origin/main' into microbuild
AArnott 14a7d27
Call out `dotnet-test-cloud.ps1` script
AArnott 8be6654
Add Copilot skill for bundling dependency update PRs
AArnott e6bb7a1
Call out docfx checks when bundling dependency update PRs
AArnott 5f59179
Merge branch 'main' into microbuild
AArnott 81b3496
Update actions/checkout action to v6.0.3 (523)
renovate[bot] 2816e20
Update dependency nerdbank.dotnetrepotools to v1.5.6 (524)
renovate[bot] dba613e
Update dependency nerdbank.dotnetrepotools to v1.5.15 (525)
renovate[bot] cd79894
Update dependency dotnet-coverage to v18.8.0 (526)
renovate[bot] 03a29b9
Update Dockerfile and global.json updates to v10.0.301 (527)
renovate[bot] 6c56573
Merge remote-tracking branch 'origin/main' into microbuild
AArnott 5762986
Merge the microbuild branch from Library.Template
invalid-email-address File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| --- | ||
| name: bundle-dependency-prs | ||
| description: Fix broken dependency update PRs and aggregate the ones that work into one PR. | ||
| disable-model-invocation: true | ||
| --- | ||
|
|
||
| # Instructions | ||
|
|
||
| You have two goals: | ||
|
|
||
| 1. Get all dependency PRs to a state where their PR checks pass. | ||
| 2. Aggregate dependency PRs with passing checks into just one PR. | ||
|
|
||
| You can identify dependency update PRs by those authored by `dependabot` or `renovate`. | ||
|
|
||
| You'll find instructions for building and validating the repo in the [CONTRIBUTING.md](../../../CONTRIBUTING.md) doc. | ||
| Always validate your changes locally before pushing them to the remote repository. | ||
|
|
||
| When writing PR bodies or comments, avoid unmatched markdown code fences. Keep markdown well-formed. | ||
|
|
||
| For purposes of assessing PR readiness by its PR checks, consider docfx related checks to be irrelevant. | ||
| If a docfx check fails but all other checks succeed, then that is a 'successful' dependency update PR. | ||
|
|
||
| ## Fix up dependency PRs with failing checks | ||
|
|
||
| Before aggregating PRs, first try to fix any individual dependency update PRs with failing build/test checks. | ||
|
|
||
| 1. For the dependency PRs with failing build or test PR checks, check out their source branch and fix any issues. | ||
| 2. Push your fixes as fresh commits to the individual dependency PRs. | ||
| 3. If you can't fix a particular PR, add a comment to the PR describing your attempt and outcome. | ||
|
|
||
| ## Group dependency PRs that are ready to go | ||
|
|
||
| Your next goal is to collect all the dependency updates that are ready to go into a single PR. | ||
|
|
||
| 1. Prepare a local branch called `bulkDepUpdates`. | ||
| 1. Consider that a remote branch by the same name may already exist. If it does, base your local branch on it. | ||
| 2. Merge `origin/main` into this branch. | ||
| 3. Resolve any conflicts. | ||
| 2. For the dependency PRs whose build and test PR checks already pass, merge them into the `bulkDepUpdates` branch. | ||
| Consider that your local branch may have already merged an equivalent PR in the past (from a past run). If so, you should skip merging that PR. | ||
| Resolve any conflicts. | ||
| Build and run tests to validate your branch. | ||
| 3. Push the branch. | ||
| 4. Create a PR, if one does not already exist. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| { | ||
| "sdk": { | ||
| "version": "10.0.300", | ||
| "version": "10.0.301", | ||
| "rollForward": "patch", | ||
| "allowPrerelease": false | ||
| }, | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.