Skip to content

Commit 525a282

Browse files
authored
Partial fix on CVE-2018-8292 (#7238)
1 parent e144c5d commit 525a282

File tree

7 files changed

+21
-9
lines changed

7 files changed

+21
-9
lines changed

src/contrib/cluster/Akka.Cluster.Metrics.Tests.MultiNode/Akka.Cluster.Metrics.Tests.MultiNode.csproj

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>$(NetTestVersion)</TargetFrameworks>
4+
<TargetFramework>$(NetTestVersion)</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
@@ -14,6 +14,7 @@
1414
<PackageReference Include="Akka.MultiNode.TestAdapter" Version="$(MultiNodeAdapterVersion)" />
1515
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
1616
<PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
17+
<PackageReference Include="xunit" Version="$(XunitVersion)"/>
1718
<PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVersion)">
1819
<PrivateAssets>all</PrivateAssets>
1920
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

src/contrib/cluster/Akka.Cluster.Sharding.Tests.MultiNode/Akka.Cluster.Sharding.Tests.MultiNode.csproj

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>$(NetTestVersion)</TargetFrameworks>
4+
<TargetFramework>$(NetTestVersion)</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
@@ -15,7 +15,8 @@
1515
<ItemGroup>
1616
<PackageReference Include="Akka.MultiNode.TestAdapter" Version="$(MultiNodeAdapterVersion)" />
1717
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
18-
<PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
18+
<PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
19+
<PackageReference Include="xunit" Version="$(XunitVersion)"/>
1920
<PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVersion)">
2021
<PrivateAssets>all</PrivateAssets>
2122
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

src/contrib/cluster/Akka.Cluster.Tools.Tests.MultiNode/Akka.Cluster.Tools.Tests.MultiNode.csproj

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>$(NetTestVersion)</TargetFrameworks>
4+
<TargetFramework>$(NetTestVersion)</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
@@ -14,7 +14,8 @@
1414
<ItemGroup>
1515
<PackageReference Include="Akka.MultiNode.TestAdapter" Version="$(MultiNodeAdapterVersion)" />
1616
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
17-
<PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
17+
<PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
18+
<PackageReference Include="xunit" Version="$(XunitVersion)"/>
1819
<PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVersion)">
1920
<PrivateAssets>all</PrivateAssets>
2021
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

src/contrib/cluster/Akka.DistributedData.Tests.MultiNode/Akka.DistributedData.Tests.MultiNode.csproj

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>$(NetTestVersion)</TargetFrameworks>
4+
<TargetFramework>$(NetTestVersion)</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
@@ -14,7 +14,8 @@
1414
<ItemGroup>
1515
<PackageReference Include="Akka.MultiNode.TestAdapter" Version="$(MultiNodeAdapterVersion)" />
1616
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
17-
<PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
17+
<PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
18+
<PackageReference Include="xunit" Version="$(XunitVersion)"/>
1819
<PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVersion)">
1920
<PrivateAssets>all</PrivateAssets>
2021
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

src/contrib/persistence/Akka.Persistence.Sql.Common/Akka.Persistence.Sql.Common.csproj

+6
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@
1313

1414
<ItemGroup>
1515
<PackageReference Include="System.Data.Common" Version="4.3.0"/>
16+
17+
<!--
18+
This reference is added to resolve CVE-2018-8292 because System.Data.Common references the bad version
19+
of this package. This can be removed if System.Data.Common ever release a clean version in the future
20+
-->
21+
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
1622
</ItemGroup>
1723

1824
</Project>

src/core/Akka.Cluster.Tests.MultiNode/Akka.Cluster.Tests.MultiNode.csproj

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>$(NetTestVersion)</TargetFrameworks>
4+
<TargetFramework>$(NetTestVersion)</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
@@ -13,7 +13,8 @@
1313
<ItemGroup>
1414
<PackageReference Include="Akka.MultiNode.TestAdapter" Version="$(MultiNodeAdapterVersion)" />
1515
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
16-
<PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
16+
<PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
17+
<PackageReference Include="xunit" Version="$(XunitVersion)"/>
1718
<PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVersion)">
1819
<PrivateAssets>all</PrivateAssets>
1920
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

src/core/Akka.Remote.Tests.MultiNode/Akka.Remote.Tests.MultiNode.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<PackageReference Include="Akka.MultiNode.TestAdapter" Version="$(MultiNodeAdapterVersion)" />
1414
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
1515
<PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
16+
<PackageReference Include="xunit" Version="$(XunitVersion)"/>
1617
<PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVersion)">
1718
<PrivateAssets>all</PrivateAssets>
1819
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

0 commit comments

Comments
 (0)