Skip to content

.NET 10 preparation#2842

Merged
martincostello merged 1 commit intomainfrom
dotnet-10-prep
Dec 4, 2025
Merged

.NET 10 preparation#2842
martincostello merged 1 commit intomainfrom
dotnet-10-prep

Conversation

@martincostello
Copy link
Member

Cherrypick some changes from #2531 while that is blocked on a new release of Stryker that supports .NET 10 GA.

Cherrypick some changes from #2531 while that is blocked on a new release of Stryker that supports .NET 10 GA.
@codecov
Copy link

codecov bot commented Dec 4, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 96.15%. Comparing base (aa6f02c) to head (0923fae).
⚠️ Report is 1 commits behind head on main.
✅ All tests successful. No failed tests found.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #2842   +/-   ##
=======================================
  Coverage   96.15%   96.15%           
=======================================
  Files         309      309           
  Lines        7123     7127    +4     
  Branches     1005     1005           
=======================================
+ Hits         6849     6853    +4     
  Misses        221      221           
  Partials       53       53           
Flag Coverage Δ
linux 96.15% <100.00%> (+<0.01%) ⬆️
macos 96.15% <100.00%> (+<0.01%) ⬆️
windows 96.14% <100.00%> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@martincostello martincostello marked this pull request as ready for review December 4, 2025 16:50
Copilot AI review requested due to automatic review settings December 4, 2025 16:50
@martincostello martincostello merged commit a83d82c into main Dec 4, 2025
28 checks passed
@martincostello martincostello deleted the dotnet-10-prep branch December 4, 2025 16:50
Copy link

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

This PR prepares the codebase for .NET 10 by cherrypicking selected changes from PR #2531. The changes focus on updating target framework prioritization, adding .NET 9.0 SDK support to CI workflows, updating dependencies, and refactoring internal field usage in bulkhead policies.

  • Reordered target frameworks to prioritize .NET 9.0 over .NET 8.0 in project files
  • Added .NET 9.0.x SDK to GitHub Actions workflows for CI/CD
  • Refactored bulkhead policy classes to use auto-properties instead of private fields
  • Updated Newtonsoft.Json dependency version

Reviewed changes

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

Show a summary per file
File Description
test/Polly.Specs/Polly.Specs.csproj Reordered target frameworks to prioritize .NET 9.0
src/Polly/Bulkhead/BulkheadPolicy.cs Refactored _maxQueueingActions field to MaxQueueingActions property in both generic and non-generic classes
src/Polly/Bulkhead/AsyncBulkheadPolicy.cs Refactored _maxQueueingActions field to MaxQueueingActions property in both generic and non-generic classes
bench/Polly.Benchmarks/Polly.Benchmarks.csproj Reordered target frameworks to prioritize .NET 9.0
Directory.Packages.props Updated Newtonsoft.Json version from 13.0.3 to 13.0.4
.github/workflows/mutation-tests.yml Added .NET 9.0.x SDK setup for mutation testing
.github/workflows/build.yml Added .NET 9.0.x SDK setup for main build workflow

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

This was referenced Mar 4, 2026
github-merge-queue bot pushed a commit to DFE-Digital/teaching-record-system that referenced this pull request Mar 9, 2026
Updated [Polly.Core](https://github.com/App-vNext/Polly) from 8.6.5 to
8.6.6.

<details>
<summary>Release notes</summary>

_Sourced from [Polly.Core's
releases](https://github.com/App-vNext/Polly/releases)._

## 8.6.6

## Highlights

* Fix `ScheduledTaskExecutor` deadlock when `TrySetResult` runs
continuations inline by @​crnhrv in
App-vNext/Polly#2953

## What's Changed

* Add specification tests for jitter by @​martincostello in
App-vNext/Polly#2830
* Refactor property-based tests by @​martincostello in
App-vNext/Polly#2831
* .NET 10 preparation by @​martincostello in
App-vNext/Polly#2842
* Fix CS7035 warning in dependabot jobs by @​martincostello in
App-vNext/Polly#2849
* Remove codecov/test-results-action by @​martincostello in
App-vNext/Polly#2872
* Update to .NET 10 SDK by @​martincostello in
App-vNext/Polly#2531
* Bump zizmor to v1.19.0 by @​martincostello in
App-vNext/Polly#2882
* Fix typo by @​martincostello in
App-vNext/Polly#2886
* Add RateLimitHeaders library to community resources by @​alexis- in
App-vNext/Polly#2887
* Bump zizmor to 1.21.0 by @​martincostello in
App-vNext/Polly#2905
* .NET 11 preparation by @​martincostello in
App-vNext/Polly#2932
* Remove Stryker workaround by @​martincostello in
App-vNext/Polly#2933
* Group .NET dependency updates by @​martincostello in
App-vNext/Polly#2944
* Migrate to actions/attest by @​martincostello in
App-vNext/Polly#2952

## New Contributors

* @​alexis- made their first contribution in
App-vNext/Polly#2887
* @​crnhrv made their first contribution in
App-vNext/Polly#2953

**Full Changelog**:
App-vNext/Polly@8.6.5...8.6.6


Commits viewable in [compare
view](App-vNext/Polly@8.6.5...8.6.6).
</details>

[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=Polly.Core&package-manager=nuget&previous-version=8.6.5&new-version=8.6.6)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: James Gunn <james@gunn.io>
PhilipWoulfe pushed a commit to PhilipWoulfe/F1Competition that referenced this pull request Mar 10, 2026
Updated [Polly](https://github.com/App-vNext/Polly) from 8.6.5 to 8.6.6.

<details>
<summary>Release notes</summary>

_Sourced from [Polly's
releases](https://github.com/App-vNext/Polly/releases)._

## 8.6.6

## Highlights

* Fix `ScheduledTaskExecutor` deadlock when `TrySetResult` runs
continuations inline by @​crnhrv in
App-vNext/Polly#2953

## What's Changed

* Add specification tests for jitter by @​martincostello in
App-vNext/Polly#2830
* Refactor property-based tests by @​martincostello in
App-vNext/Polly#2831
* .NET 10 preparation by @​martincostello in
App-vNext/Polly#2842
* Fix CS7035 warning in dependabot jobs by @​martincostello in
App-vNext/Polly#2849
* Remove codecov/test-results-action by @​martincostello in
App-vNext/Polly#2872
* Update to .NET 10 SDK by @​martincostello in
App-vNext/Polly#2531
* Bump zizmor to v1.19.0 by @​martincostello in
App-vNext/Polly#2882
* Fix typo by @​martincostello in
App-vNext/Polly#2886
* Add RateLimitHeaders library to community resources by @​alexis- in
App-vNext/Polly#2887
* Bump zizmor to 1.21.0 by @​martincostello in
App-vNext/Polly#2905
* .NET 11 preparation by @​martincostello in
App-vNext/Polly#2932
* Remove Stryker workaround by @​martincostello in
App-vNext/Polly#2933
* Group .NET dependency updates by @​martincostello in
App-vNext/Polly#2944
* Migrate to actions/attest by @​martincostello in
App-vNext/Polly#2952

## New Contributors

* @​alexis- made their first contribution in
App-vNext/Polly#2887
* @​crnhrv made their first contribution in
App-vNext/Polly#2953

**Full Changelog**:
App-vNext/Polly@8.6.5...8.6.6


Commits viewable in [compare
view](App-vNext/Polly@8.6.5...8.6.6).
</details>

[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=Polly&package-manager=nuget&previous-version=8.6.5&new-version=8.6.6)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
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.

2 participants