Skip to content

Refactor project dependencies#2696

Merged
martincostello merged 1 commit intomainfrom
fix-dependabot-alerts
Aug 12, 2025
Merged

Refactor project dependencies#2696
martincostello merged 1 commit intomainfrom
fix-dependabot-alerts

Conversation

@martincostello
Copy link
Member

Resolves dependabot alerts for CVE-2024-30105 and CVE-2024-43485 in the DependencyInjection sample.

- Split dependencies into groups to make management easier.
- Remove MSBuild variables for versions.
- Fix samples using .NET 8 instead of 9.
- Remove redundant properties.
- Sort some properties.
- Update test behaviour for Microsoft.Extensions.TimeProvider.Testing upgrade due to changes in dotnet/extensions#5783.
Copilot AI review requested due to automatic review settings August 12, 2025 10:20
@martincostello martincostello added enhancement dependencies Pull requests that update a dependency file .NET Pull requests that update .NET code labels Aug 12, 2025
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 refactors project dependencies to improve maintainability and security, splitting dependencies into logical groups while removing MSBuild variables for version management. The changes standardize all sample projects to use .NET 9.0 and move common properties to Directory.Build.props files.

  • Consolidates common project properties into Directory.Build.props files
  • Updates sample projects from .NET 8.0 to .NET 9.0 for consistency
  • Removes MSBuild variables and replaces them with explicit version declarations

Reviewed Changes

Copilot reviewed 14 out of 14 changed files in this pull request and generated 1 comment.

Show a summary per file
File Description
test/Polly.Core.Tests/Retry/RetryResilienceStrategyTests.cs Updates test to use standard FakeTimeProvider instead of custom throwing implementation
samples/*/*.csproj Removes redundant project properties that are now inherited from Directory.Build.props
samples/Directory.Build.props Adds common properties like ImplicitUsings and Nullable, sorts properties alphabetically
Directory.Packages.props Removes MSBuild variables and replaces with explicit version declarations grouped by purpose
Directory.Build.props Adds ManagePackageVersionsCentrally property
.github/dependabot.yml Adds Polly package grouping for dependabot updates

@codecov
Copy link

codecov bot commented Aug 12, 2025

Codecov Report

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

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #2696   +/-   ##
=======================================
  Coverage   96.23%   96.23%           
=======================================
  Files         311      311           
  Lines        7322     7322           
  Branches     1012     1012           
=======================================
  Hits         7046     7046           
  Misses        222      222           
  Partials       54       54           
Flag Coverage Δ
linux 96.23% <ø> (ø)
macos 96.23% <ø> (ø)
windows 96.22% <ø> (ø)

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
Copy link
Member Author

Manually verified the versions referenced by the various TGMs in the NuGet packages haven't been changed.

@martincostello martincostello merged commit 8eee77a into main Aug 12, 2025
27 checks passed
@martincostello martincostello deleted the fix-dependabot-alerts branch August 12, 2025 10:36
martincostello added a commit that referenced this pull request Aug 22, 2025
Fix xpath to get the previous release veresion broken by #2696.
martincostello added a commit that referenced this pull request Aug 22, 2025
Fix xpath to get the previous release veresion broken by #2696.
PhilipWoulfe pushed a commit to PhilipWoulfe/F1Competition that referenced this pull request Mar 2, 2026
[//]: # (dependabot-start)
⚠️  **Dependabot is rebasing this PR** ⚠️ 

Rebasing might not happen immediately, so don't worry if this takes some
time.

Note: if you make any changes to this PR yourself, they will take
precedence over the rebase.

---

[//]: # (dependabot-end)

Updated [Polly](https://github.com/App-vNext/Polly) from 8.5.2 to 8.6.5.

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

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

## 8.6.5

## What's Changed

* Extend NuGet package validation by @​martincostello in
App-vNext/Polly#2762
* Suppress S2094 warning by @​martincostello in
App-vNext/Polly#2765
* Refactor cake script by @​martincostello in
App-vNext/Polly#2769
* Pass timeout to `TimeoutRejectedException` by @​martincostello in
App-vNext/Polly#2827

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


## 8.6.4

## What's Changed

* Fix after-release and update CHANGELOG by @​martincostello in
App-vNext/Polly#2714
* Use collection expressions by @​martincostello in
App-vNext/Polly#2715
* Fix flaky mutants by @​martincostello in
App-vNext/Polly#2717
* fix documentation for ExecuteOutcomeAsync by @​carvex21 in
App-vNext/Polly#2710
* Bump MartinCostello.WaitForNuGetPackage by @​martincostello in
App-vNext/Polly#2721
* Bump sign tool by @​martincostello in
App-vNext/Polly#2722
* xunit v3 preparation by @​martincostello in
App-vNext/Polly#2723
* Add summary NuGet badges by @​martincostello in
App-vNext/Polly#2724
* Delete actionlint config by @​martincostello in
App-vNext/Polly#2730
* RateLimiting: add typed builder/guard tests and external limiter
lifetime test by @​mohammed-saalim in
App-vNext/Polly#2711
* Update Dependabot auto-merge conditions by @​martincostello in
App-vNext/Polly#2736
* Bump NuGet packages by @​martincostello in
App-vNext/Polly#2738
* Bump dotnet-stryker to 4.8.1 by @​martincostello in
App-vNext/Polly#2739
* Simplify code by @​martincostello in
App-vNext/Polly#2740
* Update zizmor by @​martincostello in
App-vNext/Polly#2746
* Use NuGet Trusted Publishing by @​martincostello in
App-vNext/Polly#2751
* Respect override for PipelineExecuting and PipelineExecuted by
@​peter-csala in App-vNext/Polly#2752

## New Contributors

* @​carvex21 made their first contribution in
App-vNext/Polly#2710
* @​mohammed-saalim made their first contribution in
App-vNext/Polly#2711

**Full Changelog**:
App-vNext/Polly@8.6.3...8.6.4


## 8.6.3

## What's Changed

* Add release notes configuration by @​martincostello in
App-vNext/Polly#2678
* Simplify release workflow by @​martincostello in
App-vNext/Polly#2679
* Sign-off commits by @​martincostello in
App-vNext/Polly#2694
* Add GitHub sponsorship by @​martincostello in
App-vNext/Polly#2695
* Refactor project dependencies by @​martincostello in
App-vNext/Polly#2696
* Add zizmor by @​martincostello in
App-vNext/Polly#2698
* Update benchmarks by @​martincostello in
App-vNext/Polly#2712
* Reduce async overhead by @​pentp in
App-vNext/Polly#2664
* Update benchmarks by @​martincostello in
App-vNext/Polly#2713

## New Contributors

* @​pentp made their first contribution in
App-vNext/Polly#2664

**Full Changelog**:
App-vNext/Polly@8.6.2...8.6.3


## 8.6.2

## What's Changed

* Performance tweaks by @​martincostello in
App-vNext/Polly#2667
* Update dependencies by @​martincostello in
App-vNext/Polly#2668
* Update benchmark results by @​martincostello in
App-vNext/Polly#2669

## New Contributors

* @​pentp made their first contribution in
App-vNext/Polly#2667

**Full Changelog**:
App-vNext/Polly@8.6.1...8.6.2


## 8.6.1

## What's Changed

* Fix integer overflow in `BulkheadSemaphoreFactory` by @​ahusseini in
App-vNext/Polly#2638
* Generate SBOM by @​martincostello in
App-vNext/Polly#2640
* Attest artifacts by @​martincostello in
App-vNext/Polly#2647

## New Contributors

* @​ahusseini made their first contribution in
App-vNext/Polly#2638

**Full Changelog**:
App-vNext/Polly@8.6.0...8.6.1

## 8.6.0

## What's Changed

* Bump Stryker by @​martincostello in
App-vNext/Polly#2476
* Fix chaos example issue and enrich notes & diagram by @​caigen in
App-vNext/Polly#2482
* Add diagram for the main chaos page sample by @​peter-csala in
App-vNext/Polly#2484
* Fix broken CI by @​martincostello in
App-vNext/Polly#2497
* Remove .NET 6 SDK by @​martincostello in
App-vNext/Polly#2501
* Use Stryker Mutator Dashboard by @​martincostello in
App-vNext/Polly#2500
* Fix Polly.Testing mutations by @​martincostello in
App-vNext/Polly#2503
* Lint PowerShell scripts by @​martincostello in
App-vNext/Polly#2504
* Improve Polly coverage by @​martincostello in
App-vNext/Polly#2505
* Improve mutation score by @​martincostello in
App-vNext/Polly#2506
* Run CodeQL for GitHub Actions by @​martincostello in
App-vNext/Polly#2498
* Add missing mutations by @​martincostello in
App-vNext/Polly#2508
* Remove dotnet tool restore by @​martincostello in
App-vNext/Polly#2513
* Add missing coverage by @​martincostello in
App-vNext/Polly#2514
* Improve mutation test perf by @​slang25 in
App-vNext/Polly#2520
* Improve coverage by @​martincostello in
App-vNext/Polly#2526
* Remove System.Text.Json reference by @​martincostello in
App-vNext/Polly#2532
* Fix test summary reliability by @​martincostello in
App-vNext/Polly#2543
* Use AuthenticodeLint by @​martincostello in
App-vNext/Polly#2553
* Use actions/create-github-app-token by @​martincostello in
App-vNext/Polly#2572
* Fix Retry strategy ShouldHandle in example code by @​marcrocny in
App-vNext/Polly#2527
* Tweak docs formatting by @​martincostello in
App-vNext/Polly#2575
* Dispose registry which contains rate limiters by @​peter-csala in
App-vNext/Polly#2578
* Improve mutation tests performance by ensuring solution file isn't
discovered by @​slang25 in App-vNext/Polly#2589
* Update LICENSE metadata by @​martincostello in
App-vNext/Polly#2590
* Add HTTP client integration samples by @​peter-csala in
App-vNext/Polly#2587
* Dedupe links by @​martincostello in
App-vNext/Polly#2592
* Add test analytics by @​martincostello in
App-vNext/Polly#2593
* Add note about context/state mix-ups by @​martincostello in
App-vNext/Polly#2598
* Emit annotation for packages by @​martincostello in
App-vNext/Polly#2601
* Add `AttemptNumber` to `HedgingPredicateArguments` by @​peter-csala in
App-vNext/Polly#2603
* .NET 10 preparation by @​martincostello in
App-vNext/Polly#2620
* Migrate to slnx by @​martincostello in
App-vNext/Polly#2623
* Fix `OnRetryArguments` comments by @​lchaoer in
App-vNext/Polly#2627
* Fix package signing by @​martincostello in
App-vNext/Polly#2631

## New Contributors

* @​caigen made their first contribution in
App-vNext/Polly#2482
* @​slang25 made their first contribution in
App-vNext/Polly#2520
* @​marcrocny made their first contribution in
App-vNext/Polly#2527
* @​lchaoer made their first contribution in
App-vNext/Polly#2627

**Full Changelog**:
App-vNext/Polly@8.5.2...8.6.0

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

[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=Polly&package-manager=nuget&previous-version=8.5.2&new-version=8.6.5)](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

dependencies Pull requests that update a dependency file enhancement .NET Pull requests that update .NET code

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants