Skip to content

Commit 0c85653

Browse files
authored
Fix MSBuild does not copy xunit.runner dlls correctly (#5747)
1 parent 6d3d91f commit 0c85653

File tree

7 files changed

+33
-8
lines changed

7 files changed

+33
-8
lines changed

src/common.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
</PropertyGroup>
1212
<PropertyGroup>
1313
<XunitVersion>2.4.1</XunitVersion>
14+
<XunitRunnerVersion>2.4.3</XunitRunnerVersion>
1415
<TestSdkVersion>17.0.0</TestSdkVersion>
1516
<HyperionVersion>0.12.0</HyperionVersion>
1617
<NewtonsoftJsonVersion>[12.0.3,)</NewtonsoftJsonVersion>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616
<PackageReference Include="Akka.MultiNode.TestAdapter" Version="$(MultiNodeAdapterVersion)" />
1717
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
1818
<PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
19+
<PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVersion)">
20+
<PrivateAssets>all</PrivateAssets>
21+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
22+
</PackageReference>
1923
</ItemGroup>
2024

2125
<ItemGroup>

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,13 @@
1515
</ItemGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="Akka.MultiNode.TestAdapter" Version="$(MultiNodeAdapterVersion)" />
19-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
18+
<PackageReference Include="Akka.MultiNode.TestAdapter" Version="$(MultiNodeAdapterVersion)" />
19+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
2020
<PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
21+
<PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVersion)">
22+
<PrivateAssets>all</PrivateAssets>
23+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
24+
</PackageReference>
2125
</ItemGroup>
2226

2327
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,13 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="Akka.MultiNode.TestAdapter" Version="$(MultiNodeAdapterVersion)" />
18-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
17+
<PackageReference Include="Akka.MultiNode.TestAdapter" Version="$(MultiNodeAdapterVersion)" />
18+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
1919
<PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
20+
<PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVersion)">
21+
<PrivateAssets>all</PrivateAssets>
22+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
23+
</PackageReference>
2024
</ItemGroup>
2125

2226
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,13 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="Akka.MultiNode.TestAdapter" Version="$(MultiNodeAdapterVersion)" />
18-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
17+
<PackageReference Include="Akka.MultiNode.TestAdapter" Version="$(MultiNodeAdapterVersion)" />
18+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
1919
<PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
20+
<PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVersion)">
21+
<PrivateAssets>all</PrivateAssets>
22+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
23+
</PackageReference>
2024
</ItemGroup>
2125

2226
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,13 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="Akka.MultiNode.TestAdapter" Version="$(MultiNodeAdapterVersion)" />
18-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
17+
<PackageReference Include="Akka.MultiNode.TestAdapter" Version="$(MultiNodeAdapterVersion)" />
18+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
1919
<PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
20+
<PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVersion)">
21+
<PrivateAssets>all</PrivateAssets>
22+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
23+
</PackageReference>
2024
</ItemGroup>
2125

2226
<ItemGroup>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515
<PackageReference Include="Akka.MultiNode.TestAdapter" Version="$(MultiNodeAdapterVersion)" />
1616
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
1717
<PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
18+
<PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVersion)">
19+
<PrivateAssets>all</PrivateAssets>
20+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
21+
</PackageReference>
1822
</ItemGroup>
1923

2024
<ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkTestVersion)' ">

0 commit comments

Comments
 (0)