From 656f4b0e33c1c0769cab7793964f43173c3429ee Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 12 Sep 2024 17:04:32 +0000
Subject: [PATCH 1/2] Bump the xunit group across 1 directory with 2 updates

Bumps the xunit group with 2 updates in the / directory: xunit and xunit.runner.visualstudio.


Updates `xunit` from 2.7.0 to 2.9.0

Updates `xunit.runner.visualstudio` from 2.5.7 to 2.8.2

---
updated-dependencies:
- dependency-name: xunit
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: xunit
- dependency-name: xunit.runner.visualstudio
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: xunit
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Directory.Packages.props | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 5b4f32cd61..9dac91f2a8 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -43,7 +43,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.7.0" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.7" />
+    <PackageVersion Include="xunit" Version="2.9.0" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
   </ItemGroup>
 </Project>

From 35967a314561380bf534d3cdaf2eca1a3570ba3c Mon Sep 17 00:00:00 2001
From: martincostello <martin@martincostello.com>
Date: Mon, 16 Sep 2024 09:19:23 +0100
Subject: [PATCH 2/2] Fix HedgingActionGenerator_EnsureDefaults

Fix test broken by changes to xunit's parallelism algorithm.
See https://github.com/xunit/xunit/discussions/3024.
---
 test/Polly.Core.Tests/Polly.Core.Tests.csproj | 5 +++++
 test/Polly.Core.Tests/xunit.runner.json       | 4 ++++
 2 files changed, 9 insertions(+)
 create mode 100644 test/Polly.Core.Tests/xunit.runner.json

diff --git a/test/Polly.Core.Tests/Polly.Core.Tests.csproj b/test/Polly.Core.Tests/Polly.Core.Tests.csproj
index 33b7e17deb..898e2cdf83 100644
--- a/test/Polly.Core.Tests/Polly.Core.Tests.csproj
+++ b/test/Polly.Core.Tests/Polly.Core.Tests.csproj
@@ -26,4 +26,9 @@
     <Using Include="Polly.Core.Tests.Helpers" />
     <Using Include="Polly.TestUtils" />
   </ItemGroup>
+
+  <!-- Workaround for xunit 2.8.0+ change. See https://github.com/xunit/xunit/discussions/3024.  -->
+  <ItemGroup>
+    <Content Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
+  </ItemGroup>
 </Project>
diff --git a/test/Polly.Core.Tests/xunit.runner.json b/test/Polly.Core.Tests/xunit.runner.json
new file mode 100644
index 0000000000..8e343ae0a7
--- /dev/null
+++ b/test/Polly.Core.Tests/xunit.runner.json
@@ -0,0 +1,4 @@
+{
+  "$schema": "https://xunit.net/schema/current/xunit.runner.schema.json",
+  "parallelAlgorithm": "aggressive"
+}