Skip to content

Merge v2.24 to main#1433

Merged
AArnott merged 8 commits into
mainfrom
dev/andarno/v2.24-to-main
May 13, 2026
Merged

Merge v2.24 to main#1433
AArnott merged 8 commits into
mainfrom
dev/andarno/v2.24-to-main

Conversation

@AArnott
Copy link
Copy Markdown
Member

@AArnott AArnott commented May 13, 2026

  • Update dependency nerdbank.dotnetrepotools to v1.4.1 (515)
  • Bump Nerdbank.MessagePack to 1.1.62
  • Update Dockerfile and global.json updates to v10.0.300 (516)

renovate Bot and others added 8 commits May 9, 2026 06:56
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Resolve merge conflicts by keeping the current README, re-deleting Expand-Template.ps1, and merging package/tooling updates from Library.Template.

Keep Microsoft.Testing.Platform pinned to 2.1.0 instead of the incoming 2.2.2 because the newer runner introduced instability in this repo's cloud-style test validation. Also fix a compile issue in NerdbankMessagePackFormatter and mark local dotnet-test-cloud runs so GC-sensitive tests use the same relaxed collection assertion behavior as Azure Pipelines.
Copilot AI review requested due to automatic review settings May 13, 2026 17:09
@AArnott AArnott changed the title dev/andarno/v2.24 to main Merge v2.24 to main May 13, 2026
@AArnott AArnott enabled auto-merge May 13, 2026 17:09
Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Routine dependency/tooling bumps merging from the dev/andarno/v2.24 branch into main.

Changes:

  • Bump .NET SDK from 10.0.203 to 10.0.300 in global.json.
  • Bump Nerdbank.MessagePack from 1.0.11 to 1.1.62.
  • Bump nerdbank.dotnetrepotools tool from 1.3.22 to 1.4.1.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.

File Description
global.json Updates the .NET SDK pinned version to 10.0.300.
Directory.Packages.props Updates Nerdbank.MessagePack package version to 1.1.62.
.config/dotnet-tools.json Updates nerdbank.dotnetrepotools CLI tool to 1.4.1.

@AArnott AArnott merged commit 68330cd into main May 13, 2026
12 of 13 checks passed
@AArnott AArnott deleted the dev/andarno/v2.24-to-main branch May 13, 2026 17:31
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.

3 participants