From 3c61f462906e8e4ab31a6f11ec734aa85b9d6caa Mon Sep 17 00:00:00 2001
From: Gregorius Soedharmo <arkatufus@yahoo.com>
Date: Fri, 7 Jun 2024 03:18:36 +0700
Subject: [PATCH] Partial fix for CVE-2018-8292 (#7235)

---
 src/Directory.Build.props                                     | 4 ++--
 src/benchmark/Akka.Benchmarks/Akka.Benchmarks.csproj          | 1 -
 .../Akka.Cluster.Benchmarks/Akka.Cluster.Benchmarks.csproj    | 1 -
 .../Sharding/ShardMessageRoutingBenchmarks.cs                 | 2 --
 src/core/Akka.Docs.Tests/Akka.Docs.Tests.csproj               | 1 -
 .../Akka.Persistence.TestKit.Tests.csproj                     | 1 -
 6 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index a3a53d8efa2..c050782264a 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -18,8 +18,8 @@
     <LangVersion>11.0</LangVersion>
   </PropertyGroup>
   <PropertyGroup>
-    <XunitVersion>2.5.3</XunitVersion>
-    <XunitRunnerVersion>2.5.3</XunitRunnerVersion>
+    <XunitVersion>2.8.1</XunitVersion>
+    <XunitRunnerVersion>2.8.1</XunitRunnerVersion>
     <TestSdkVersion>17.9.0</TestSdkVersion>
     <HyperionVersion>0.12.2</HyperionVersion>
     <NewtonsoftJsonVersion>[13.0.1,)</NewtonsoftJsonVersion>
diff --git a/src/benchmark/Akka.Benchmarks/Akka.Benchmarks.csproj b/src/benchmark/Akka.Benchmarks/Akka.Benchmarks.csproj
index 2473a78dc35..133bcd0df00 100644
--- a/src/benchmark/Akka.Benchmarks/Akka.Benchmarks.csproj
+++ b/src/benchmark/Akka.Benchmarks/Akka.Benchmarks.csproj
@@ -7,7 +7,6 @@
 
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="$(BenchmarkDotNetVersion)" />
-    <PackageReference Include="BenchmarkDotNet.Diagnostics.dotTrace" Version="0.13.12" />
     <!-- FluentAssertions is used in some benchmarks to validate internal behaviors -->
     <PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
   </ItemGroup>
diff --git a/src/benchmark/Akka.Cluster.Benchmarks/Akka.Cluster.Benchmarks.csproj b/src/benchmark/Akka.Cluster.Benchmarks/Akka.Cluster.Benchmarks.csproj
index bec304ee133..9eba3f3eff2 100644
--- a/src/benchmark/Akka.Cluster.Benchmarks/Akka.Cluster.Benchmarks.csproj
+++ b/src/benchmark/Akka.Cluster.Benchmarks/Akka.Cluster.Benchmarks.csproj
@@ -6,7 +6,6 @@
 
     <ItemGroup>
         <PackageReference Include="BenchmarkDotNet" Version="$(BenchmarkDotNetVersion)" />
-        <PackageReference Include="BenchmarkDotNet.Diagnostics.dotTrace" Version="0.13.12" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/benchmark/Akka.Cluster.Benchmarks/Sharding/ShardMessageRoutingBenchmarks.cs b/src/benchmark/Akka.Cluster.Benchmarks/Sharding/ShardMessageRoutingBenchmarks.cs
index 59a28ec48b8..973a9c55d54 100644
--- a/src/benchmark/Akka.Cluster.Benchmarks/Sharding/ShardMessageRoutingBenchmarks.cs
+++ b/src/benchmark/Akka.Cluster.Benchmarks/Sharding/ShardMessageRoutingBenchmarks.cs
@@ -14,13 +14,11 @@
 using Akka.Cluster.Sharding;
 using Akka.Routing;
 using BenchmarkDotNet.Attributes;
-using BenchmarkDotNet.Diagnostics.dotTrace;
 using BenchmarkDotNet.Engines;
 using static Akka.Cluster.Benchmarks.Sharding.ShardingHelper;
 
 namespace Akka.Cluster.Benchmarks.Sharding
 {
-    [DotTraceDiagnoser]
     [Config(typeof(MonitoringConfig))]
     [SimpleJob(RunStrategy.Monitoring, launchCount: 10, warmupCount: 10)]
     public class ShardMessageRoutingBenchmarks
diff --git a/src/core/Akka.Docs.Tests/Akka.Docs.Tests.csproj b/src/core/Akka.Docs.Tests/Akka.Docs.Tests.csproj
index 2bf21edb3c9..c2276e5c5dd 100644
--- a/src/core/Akka.Docs.Tests/Akka.Docs.Tests.csproj
+++ b/src/core/Akka.Docs.Tests/Akka.Docs.Tests.csproj
@@ -18,7 +18,6 @@
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
-    <PackageReference Include="System.Net.Http" Version="4.3.4" />
     <PackageReference Include="xunit" Version="$(XunitVersion)" />
     <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />
   </ItemGroup>
diff --git a/src/core/Akka.Persistence.TestKit.Tests/Akka.Persistence.TestKit.Tests.csproj b/src/core/Akka.Persistence.TestKit.Tests/Akka.Persistence.TestKit.Tests.csproj
index 741419f95b0..2e65154acfd 100644
--- a/src/core/Akka.Persistence.TestKit.Tests/Akka.Persistence.TestKit.Tests.csproj
+++ b/src/core/Akka.Persistence.TestKit.Tests/Akka.Persistence.TestKit.Tests.csproj
@@ -9,7 +9,6 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
     <PackageReference Include="xunit" Version="$(XunitVersion)" />
-    <PackageReference Include="xunit.runner.utility" Version="$(XunitVersion)" />
     <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />
     <PackageReference Include="TeamCity.ServiceMessages" Version="3.0.13" />
     <PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />