Skip to content
Merged
Show file tree
Hide file tree
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] May 15, 2026
8b81322
Merge remote-tracking branch 'origin/main' into microbuild
AArnott May 15, 2026
f24b9f1
Update dependency Microsoft.Testing.Extensions.CodeCoverage to 18.7.0…
renovate[bot] May 18, 2026
1de022c
Update dependency dotnet-coverage to v18.7.0 (518)
renovate[bot] May 18, 2026
39a5c36
Merge remote-tracking branch 'origin/main' into microbuild
AArnott May 18, 2026
caa057e
Update mcr.microsoft.com/dotnet/sdk:10.0.300 Docker digest to c079063…
renovate[bot] May 21, 2026
3fd37fb
Merge remote-tracking branch 'origin/main' into microbuild
AArnott May 21, 2026
e7468d6
Update dependency powershell to v7.6.2 (#521)
renovate[bot] May 21, 2026
08ad1de
Update dependency PolySharp to 1.16.0 (#522)
renovate[bot] May 26, 2026
3bdfd03
Fix Install-DotNetSdk.ps1 hang from recursive Directory.Build.props s…
drognanar May 26, 2026
8e28503
Merge remote-tracking branch 'origin/main' into microbuild
AArnott May 26, 2026
14a7d27
Call out `dotnet-test-cloud.ps1` script
AArnott Jun 2, 2026
8be6654
Add Copilot skill for bundling dependency update PRs
AArnott Jun 2, 2026
e6bb7a1
Call out docfx checks when bundling dependency update PRs
AArnott Jun 2, 2026
5f59179
Merge branch 'main' into microbuild
AArnott Jun 2, 2026
81b3496
Update actions/checkout action to v6.0.3 (523)
renovate[bot] Jun 2, 2026
2816e20
Update dependency nerdbank.dotnetrepotools to v1.5.6 (524)
renovate[bot] Jun 3, 2026
dba613e
Update dependency nerdbank.dotnetrepotools to v1.5.15 (525)
renovate[bot] Jun 4, 2026
cd79894
Update dependency dotnet-coverage to v18.8.0 (526)
renovate[bot] Jun 8, 2026
03a29b9
Update Dockerfile and global.json updates to v10.0.301 (527)
renovate[bot] Jun 10, 2026
6c56573
Merge remote-tracking branch 'origin/main' into microbuild
AArnott Jun 10, 2026
cc33e9f
Merge the microbuild branch from https://github.com/aarnott/Library.T…
invalid-email-address Jun 10, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
"isRoot": true,
"tools": {
"powershell": {
"version": "7.6.1",
"version": "7.6.2",
"commands": [
"pwsh"
],
"rollForward": false
},
"dotnet-coverage": {
"version": "18.6.2",
"version": "18.8.0",
"commands": [
"dotnet-coverage"
],
Expand All @@ -31,7 +31,7 @@
"rollForward": false
},
"nerdbank.dotnetrepotools": {
"version": "1.4.1",
"version": "1.5.15",
"commands": [
"repo"
],
Expand Down
45 changes: 45 additions & 0 deletions .github/skills/bundle-dependency-prs/SKILL.md
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.
2 changes: 1 addition & 1 deletion .github/workflows/copilot-setup-steps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
# You can define any steps you want, and they will run before the agent starts.
# If you do not check out your code, Copilot will do this for you.
steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
- name: ⚙ Install prerequisites
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
url: ${{ steps.deployment.outputs.page_url }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
- name: ⚙ Install prerequisites
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/libtemplate-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
contents: write
pull-requests: write
steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
fetch-depth: 0 # avoid shallow clone so nbgv can do its work.

Expand Down
8 changes: 7 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,11 @@ This repository can be built on Windows.

Building, testing, and packing this repository can be done by using the standard dotnet CLI commands (e.g. `dotnet build`, `dotnet test`, `dotnet pack`, etc.).

[pwsh]: https://learn.microsoft.com/powershell/scripting/install/installing-powershell
## Testing

You can use `dotnet test` to build and/or test the repo.

There may be tests that are known to be unstable or have special requirements. These can be avoided by running tests using the [dotnet-test-cloud.ps1](tools/dotnet-test-cloud.ps1) script *after* running `dotnet build`.

## Releases

Expand Down Expand Up @@ -96,3 +100,5 @@ git checkout origin/main
# resolve any conflicts, then commit the merge commit.
git push origin -u HEAD
```

[pwsh]: https://learn.microsoft.com/powershell/scripting/install/installing-powershell
6 changes: 3 additions & 3 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
<MicrosoftTestingPlatformVersion>2.2.2</MicrosoftTestingPlatformVersion>
<MicrosoftTestingPlatformVersion>2.2.3</MicrosoftTestingPlatformVersion>

<MicroBuildVersion>2.0.226</MicroBuildVersion>
</PropertyGroup>
Expand All @@ -26,7 +26,7 @@
<PackageVersion Include="xunit.v3.extensibility.core" Version="3.2.2" />
</ItemGroup>
<ItemGroup Label="Library.Template">
<PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.6.2" />
<PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.7.0" />
<PackageVersion Include="Microsoft.Testing.Extensions.CrashDump" Version="$(MicrosoftTestingPlatformVersion)" />
<PackageVersion Include="Microsoft.Testing.Extensions.HangDump" Version="$(MicrosoftTestingPlatformVersion)" />
<PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="$(MicrosoftTestingPlatformVersion)" />
Expand All @@ -42,7 +42,7 @@
<GlobalPackageReference Include="Microsoft.VisualStudio.Internal.MicroBuild.VisualStudio" Version="$(MicroBuildVersion)" />
<!-- The condition works around https://github.com/dotnet/sdk/issues/44951 -->
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.9.50" Condition="!('$(TF_BUILD)'=='true' and '$(dotnetformat)'=='true')" />
<GlobalPackageReference Include="PolySharp" Version="1.15.0" />
<GlobalPackageReference Include="PolySharp" Version="1.16.0" />
<GlobalPackageReference Include="StyleCop.Analyzers.Unstable" Version="1.2.0.556" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion global.json
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
},
Expand Down
5 changes: 4 additions & 1 deletion tools/Install-DotNetSdk.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,10 @@ $runtimeVersions = @()
$windowsDesktopRuntimeVersions = @()
$aspnetRuntimeVersions = @()
if (!$SdkOnly) {
Get-ChildItem "$PSScriptRoot\..\src\*.*proj", "$PSScriptRoot\..\test\*.*proj", "$PSScriptRoot\..\Directory.Build.props" -Recurse | % {
$projFiles = Get-ChildItem "$PSScriptRoot\..\src\*.*proj", "$PSScriptRoot\..\test\*.*proj" -Recurse
$projFiles += Get-ChildItem "$PSScriptRoot\..\src\Directory.Build.props", "$PSScriptRoot\..\test\Directory.Build.props" -Recurse
$projFiles += Get-Item -LiteralPath "$PSScriptRoot\..\Directory.Build.props"
$projFiles | % {
$projXml = [xml](Get-Content -LiteralPath $_)
$pg = $projXml.Project.PropertyGroup
if ($pg) {
Expand Down
Loading