Merge branch 'main' into async-opts

pentp · pentp · commit a3467586de55 · 2025-08-12T12:20:19.000+03:00
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -24,7 +24,7 @@
       "rollForward": false
     },
     "dotnet-stryker": {
-      "version": "4.5.1",
+      "version": "4.7.0",
       "commands": [
         "dotnet-stryker"
       ],
@@ -58,4 +58,4 @@
       "rollForward": false
     }
   }
-}
+}
diff --git a/.github/release.yml b/.github/release.yml
@@ -0,0 +1,6 @@
+changelog:
+  exclude:
+    authors:
+      - dependabot[bot]
+      - github-actions[bot]
+      - polly-updater-bot[bot]
diff --git a/.github/workflows/after-release.yml b/.github/workflows/after-release.yml
@@ -82,7 +82,7 @@ jobs:
 
           git checkout -b $branchName
           git add .
-          git commit -m "Update CHANGELOG`n`nUpdate CHANGELOG and samples for v${env:RELEASE_VERSION}."
+          git commit -m "Update CHANGELOG`n`nUpdate CHANGELOG and samples for v${env:RELEASE_VERSION}." -s
           git push -u origin $branchName
 
           "branch-name=${branchName}" >> ${env:GITHUB_OUTPUT}
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -89,7 +89,7 @@ jobs:
       id: setup-dotnet
 
     - name: Setup NuGet cache
-      uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
+      uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
       with:
         path: ${{ env.NUGET_PACKAGES }}
         key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj', '**/*.props') }}
@@ -138,7 +138,7 @@ jobs:
         if-no-files-found: error
 
     - name: Generate SBOM
-      uses: anchore/sbom-action@cee1b8e05ae5b2593a75e197229729eabaa9f8ec # v0.20.2
+      uses: anchore/sbom-action@7b36ad622f042cab6f59a75c2ac24ccb256e9b45 # v0.20.4
       if: runner.os == 'Windows'
       with:
         artifact-name: polly.spdx.json
@@ -165,7 +165,7 @@ jobs:
     steps:
 
     - name: Download packages
-      uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+      uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
       with:
         name: packages-windows
 
@@ -209,13 +209,13 @@ jobs:
     steps:
 
     - name: Download unsigned packages
-      uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+      uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
       with:
         name: packages-windows
         path: packages
 
     - name: Download signing configuration
-      uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+      uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
       with:
         name: signing-config
         path: signing-config
@@ -279,12 +279,12 @@ jobs:
     steps:
 
     - name: Download packages
-      uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+      uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
       with:
         name: signed-packages
 
     - name: Download SBOM
-      uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+      uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
       with:
         name: polly.spdx.json
         path: ./artifacts
@@ -404,7 +404,7 @@ jobs:
     steps:
 
     - name: Download signed packages
-      uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+      uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
       with:
         name: signed-packages
 
diff --git a/.github/workflows/code-ql.yml b/.github/workflows/code-ql.yml
@@ -38,13 +38,13 @@ jobs:
         show-progress: false
 
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
+      uses: github/codeql-action/init@a4e1a019f5e24960714ff6296aee04b736cbc3cf # v3.29.6
       with:
         build-mode: none
         languages: ${{ matrix.language }}
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
+      uses: github/codeql-action/analyze@a4e1a019f5e24960714ff6296aee04b736cbc3cf # v3.29.6
       with:
         category: '/language:${{ matrix.language }}'
 
diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
@@ -78,7 +78,7 @@ jobs:
     steps:
 
     - name: Download documentation
-      uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+      uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
       with:
         name: docs
         path: docs
diff --git a/.github/workflows/on-push-do-docs.yml b/.github/workflows/on-push-do-docs.yml
@@ -73,7 +73,7 @@ jobs:
 
           git checkout -b $BranchName
           git add .
-          git commit -m "Update the code-snippets in the documentation"
+          git commit -m "Update the code-snippets in the documentation" -s
           git push -u origin $BranchName
           "updated-docs=true" >> ${env:GITHUB_OUTPUT}
 
diff --git a/.github/workflows/ossf-scorecard.yml b/.github/workflows/ossf-scorecard.yml
@@ -42,6 +42,6 @@ jobs:
           retention-days: 5
 
       - name: Upload to code-scanning
-        uses: github/codeql-action/upload-sarif@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
+        uses: github/codeql-action/upload-sarif@a4e1a019f5e24960714ff6296aee04b736cbc3cf # v3.29.6
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -45,30 +45,14 @@ jobs:
               version = version.slice(1);
             }
 
-            const tag_name = version;
-            const name = tag_name;
-
-            const { data: notes } = await github.rest.repos.generateReleaseNotes({
-              owner,
-              repo,
-              tag_name,
-              target_commitish: process.env.DEFAULT_BRANCH,
-            });
-
-            const body = notes.body
-              .split('\n')
-              .filter((line) => !line.includes(' @dependabot '))
-              .filter((line) => !line.includes(' @github-actions '))
-              .filter((line) => !line.includes(' @polly-updater-bot '))
-              .join('\n');
-
             const { data: release } = await github.rest.repos.createRelease({
               owner,
               repo,
-              tag_name,
-              name,
-              body,
+              tag_name: version,
+              target_commitish: process.env.DEFAULT_BRANCH,
+              name: version,
               draft,
+              generate_release_notes: true,
             });
 
             core.notice(`Created release ${release.name}: ${release.html_url}`);
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,12 @@
 
 <!-- next-release -->
 
+## 8.6.2
+
+* Performance tweaks by [@martincostello](https://github.com/martincostello) in https://github.com/App-vNext/Polly/pull/2667
+* Update dependencies by [@martincostello](https://github.com/martincostello) in https://github.com/App-vNext/Polly/pull/2668
+* Update benchmark results by [@martincostello](https://github.com/martincostello) in https://github.com/App-vNext/Polly/pull/2669
+
 ## 8.6.1
 
 * Fix integer overflow in `BulkheadSemaphoreFactory` by [@ahusseini](https://github.com/ahusseini) in https://github.com/App-vNext/Polly/pull/2638
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -1,15 +1,16 @@
 <Project>
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-    <PollyVersion>8.6.1</PollyVersion>
+    <PollyVersion>8.6.2</PollyVersion>
     <MicrosoftExtensionsVersion>8.0.0</MicrosoftExtensionsVersion>
   </PropertyGroup>
   <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible($(TargetFramework), 'net9.0'))">
     <MicrosoftExtensionsVersion>9.0.0</MicrosoftExtensionsVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="coverlet.msbuild" Version="6.0.4" />
     <PackageVersion Include="BenchmarkDotNet" Version="0.15.2" />
+    <PackageVersion Include="Cake.FileHelpers" Version="7.0.0" />
+    <PackageVersion Include="coverlet.msbuild" Version="6.0.4" />
     <PackageVersion Include="Flurl.Http.Signed" Version="4.0.2" />
     <PackageVersion Include="FSharp.Core" Version="8.0.200" />
     <PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
@@ -31,13 +32,14 @@
     <PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="8.10.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
     <PackageVersion Include="MinVer" Version="6.0.0" />
+    <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="NSubstitute" Version="5.3.0" />
     <PackageVersion Include="Polly" Version="$(PollyVersion)" />
+    <PackageVersion Include="Polly.Contrib.WaitAndRetry" Version="1.1.1" />
     <PackageVersion Include="Polly.Core" Version="$(PollyVersion)" />
-    <PackageVersion Include="Polly.RateLimiting" Version="$(PollyVersion)" />
     <PackageVersion Include="Polly.Extensions" Version="$(PollyVersion)" />
+    <PackageVersion Include="Polly.RateLimiting" Version="$(PollyVersion)" />
     <PackageVersion Include="Polly.Testing" Version="$(PollyVersion)" />
-    <PackageVersion Include="Polly.Contrib.WaitAndRetry" Version="1.1.1" />
     <PackageVersion Include="Refit.HttpClientFactory" Version="8.0.0" />
     <PackageVersion Include="ReportGenerator" Version="5.4.8" />
     <PackageVersion Include="RestSharp" Version="112.1.0" />
@@ -46,10 +48,11 @@
     <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
     <PackageVersion Include="System.ComponentModel.Annotations" Version="4.5.0" />
     <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="$(MicrosoftExtensionsVersion)" />
+    <PackageVersion Include="System.Text.Json" Version="9.0.7" />
     <PackageVersion Include="System.Threading.RateLimiting" Version="$(MicrosoftExtensionsVersion)" />
     <PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
     <PackageVersion Include="System.ValueTuple" Version="4.5.0" />
     <PackageVersion Include="xunit" Version="2.9.3" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.1" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.3" />
   </ItemGroup>
 </Project>
diff --git a/README.md b/README.md
@@ -483,10 +483,12 @@ Thanks to the following companies for sponsoring the ongoing development of Poll
 
 - [.NET on AWS Open Source Software Fund](https://github.com/aws/dotnet-foss)
 - [Microsoft's Free and Open Source Software Fund](https://github.com/microsoft/foss-fund)
+- [GitHub's Secure Open Source Fund](https://resources.github.com/github-secure-open-source-fund/)
 
 <!-- markdownlint-disable MD042 -->
 [![AWS logo](./logos/aws.png)](#)
 [![Microsoft logo](./logos/microsoft.png)](#)
+[![GitHub logo](./logos/github.png)](#)
 <!-- markdownlint-enable MD034 -->
 
 Help support this project by becoming a sponsor through [GitHub Sponsors](https://github.com/sponsors/martincostello).
diff --git a/docs/community/resources.md b/docs/community/resources.md
@@ -30,6 +30,7 @@ This includes Blogs, podcasts, courses, e-books, architecture samples and videos
 - [Retries - An interactive study of common retry methods](https://encore.dev/blog/retries) - by [Sam Rose](https://twitter.com/samwhoo)
 - [Building resilient cloud services with .NET 8](https://devblogs.microsoft.com/dotnet/building-resilient-cloud-services-with-dotnet-8/) by [Martin Tomka](https://github.com/martintmk)
 - [Resilience and chaos engineering](https://devblogs.microsoft.com/dotnet/resilience-and-chaos-engineering/) by [Martin Tomka](https://github.com/martintmk)
+- [Securing the supply chain at scale - Starting with 71 important open source projects](https://github.blog/open-source/maintainers/securing-the-supply-chain-at-scale-starting-with-71-important-open-source-projects/) by [Gregg Cochran](https://github.com/dubsopenhub)
 
 ## Podcasts
 
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "9.0.302",
+    "version": "9.0.304",
     "allowPrerelease": false,
     "rollForward": "latestMajor"
   }
diff --git a/logos/github.png b/logos/github.png
diff --git a/samples/Chaos/Chaos.csproj b/samples/Chaos/Chaos.csproj
@@ -10,6 +10,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Http.Resilience" />
     <PackageReference Include="Polly.Core" />
+    <PackageReference Include="System.Text.Json" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Snippets/Snippets.csproj b/src/Snippets/Snippets.csproj
@@ -16,21 +16,24 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Http.Resilience" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" />
-    <PackageReference Include="xunit" />
+    <ProjectReference Include="..\Polly.Extensions\Polly.Extensions.csproj" />
+    <ProjectReference Include="..\Polly.RateLimiting\Polly.RateLimiting.csproj" />
+    <ProjectReference Include="..\Polly.Testing\Polly.Testing.csproj" />
+    <ProjectReference Include="..\Polly\Polly.csproj" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="Flurl.Http.Signed" />
+    <PackageReference Include="Microsoft.Extensions.Http.Resilience" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" />
+    <PackageReference Include="NSubstitute" />
     <PackageReference Include="Refit.HttpClientFactory" />
     <PackageReference Include="RestSharp" />
-    <ProjectReference Include="..\Polly.Extensions\Polly.Extensions.csproj" />
-    <ProjectReference Include="..\Polly.RateLimiting\Polly.RateLimiting.csproj" />
-    <ProjectReference Include="..\Polly.Testing\Polly.Testing.csproj" />
-    <ProjectReference Include="..\Polly\Polly.csproj" />
-    <PackageReference Include="NSubstitute" />
+    <PackageReference Include="System.Text.Json" />
+    <PackageReference Include="xunit" />
+  </ItemGroup>
 
+  <ItemGroup>
     <Using Include="Polly" />
   </ItemGroup>
 

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`"rollForward": false`
`25`	`25`	`},`
`26`	`26`	`"dotnet-stryker": {`
`27`		`- "version": "4.5.1",`
	`27`	`+ "version": "4.7.0",`
`28`	`28`	`"commands": [`
`29`	`29`	`"dotnet-stryker"`
`30`	`30`	`],`
`@@ -58,4 +58,4 @@`
`58`	`58`	`"rollForward": false`
`59`	`59`	`}`
`60`	`60`	`}`
`61`		`-}`
	`61`	`+}`