Skip to content

Commit 9fa5511

Browse files
zivkanzivkan
committed
Migrate to xunit v3
1 parent 06ee0a5 commit 9fa5511

123 files changed

Lines changed: 373 additions & 721 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Directory.Packages.props‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<SystemTextJsonVersion Condition="'$(SystemTextJsonVersion)' == ''">8.0.5</SystemTextJsonVersion>
1111
<SystemCommandLineVersion Condition="'$(SystemCommandLineVersion)' == ''">2.0.0-beta7.25374.102</SystemCommandLineVersion>
1212
<MSTestPackageVersion>3.4.3</MSTestPackageVersion>
13+
<xunitv3PackageVersion>3.2.2</xunitv3PackageVersion>
1314
</PropertyGroup>
1415

1516
<PropertyGroup>
@@ -73,7 +74,7 @@
7374
<PackageVersion Include="Microsoft.VisualStudio.Extensibility.Sdk" Version="17.14.40177" />
7475
<PackageVersion Include="Microsoft.VisualStudio.Extensibility.Build" Version=" 17.14.40177" />
7576
<PackageVersion Include="Microsoft.VisualStudio.SDK" Version="18.0.2345-preview.1" />
76-
<PackageVersion Include="Microsoft.VisualStudio.Sdk.TestFramework.Xunit" Version="17.11.8" />
77+
<PackageVersion Include="Microsoft.VisualStudio.Sdk.TestFramework.Xunit.v3" Version="17.11.66" />
7778
<PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="3.4.2244" />
7879
<PackageVersion Include="Microsoft.VisualStudio.Shell.Styles" Version="18.0.2345-preview.1" />
7980
<PackageVersion Include="Microsoft.VisualStudio.TemplateWizardInterface" Version="17.10.40170" />
@@ -104,9 +105,11 @@
104105
-->
105106
<PackageVersion Include="System.Threading.Tasks.Dataflow" Version="4.9.0" />
106107
<PackageVersion Include="VsWebSite.Interop" Version="17.10.40173" />
107-
<PackageVersion Include="xunit" Version="2.9.0" />
108+
<PackageVersion Include="xunit.v3" Version="$(xunitv3PackageVersion)" />
109+
<PackageVersion Include="xunit.v3.assert" Version="$(xunitv3PackageVersion)" />
110+
<PackageVersion Include="xunit.v3.extensibility.core" Version="$(xunitv3PackageVersion)" />
108111
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
109-
<PackageVersion Include="Xunit.StaFact" Version="1.1.11" />
112+
<PackageVersion Include="Xunit.StaFact" Version="3.0.13" />
110113
</ItemGroup>
111114

112115
<!--

‎build/test.targets‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@
44
<!-- Shared test project template -->
55

66
<PropertyGroup>
7-
<NoWarn>$(NoWarn);CS1701;xUnit1012;xUnit1014;xUnit2000;xUnit2009;xUnit2013</NoWarn>
7+
<OutputType>Exe</OutputType>
8+
<NoWarn>$(NoWarn);CS1701;xUnit1012;xUnit1014;xUnit1051;xUnit2000;xUnit2009;xUnit2013;xUnit2031</NoWarn>
89
<WarningsAsErrors>$(WarningsAsErrors);xUnit2024</WarningsAsErrors>
910
</PropertyGroup>
1011

1112
<ItemGroup>
1213
<PackageReference Include="Microsoft.NET.Test.Sdk" />
1314
<PackageReference Include="xunit.runner.visualstudio" />
14-
<PackageReference Include="xunit" />
15+
<PackageReference Include="xunit.v3" />
1516
<PackageReference Include="Moq" />
1617
<PackageReference Include="AwesomeAssertions" />
1718
</ItemGroup>

‎test/NuGet.Clients.FuncTests/NuGet.CommandLine.FuncTest/CommandRunnerTest.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
using NuGet.Common;
1313
using NuGet.Test.Utility;
1414
using Xunit;
15-
using Xunit.Abstractions;
1615

1716
namespace NuGet.CommandLine.FuncTest
1817
{

‎test/NuGet.Clients.FuncTests/NuGet.CommandLine.FuncTest/Commands/InstallCommandTests.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
using NuGet.Test.Utility;
1414
using Test.Utility.Signing;
1515
using Xunit;
16-
using Xunit.Abstractions;
1716

1817
namespace NuGet.CommandLine.FuncTest.Commands
1918
{

‎test/NuGet.Clients.FuncTests/NuGet.CommandLine.FuncTest/Commands/PushCommandTest.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
using NuGet.Test.Utility;
1515
using Test.Utility;
1616
using Xunit;
17-
using Xunit.Abstractions;
1817

1918
namespace NuGet.CommandLine.FuncTest.Commands
2019
{

‎test/NuGet.Clients.FuncTests/NuGet.CommandLine.FuncTest/Commands/RestoreCommandSignPackagesTests.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
using NuGet.Test.Utility;
2020
using Test.Utility.Signing;
2121
using Xunit;
22-
using Xunit.Abstractions;
2322

2423
namespace NuGet.CommandLine.FuncTest.Commands
2524
{

‎test/NuGet.Clients.FuncTests/NuGet.CommandLine.FuncTest/Commands/RestoreCommandTests.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
using NuGet.Versioning;
2424
using Test.Utility;
2525
using Xunit;
26-
using Xunit.Abstractions;
2726

2827
namespace NuGet.CommandLine.FuncTest.Commands
2928
{

‎test/NuGet.Clients.FuncTests/NuGet.CommandLine.FuncTest/Commands/SearchCommandTests.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
using NuGet.Test.Utility;
1212
using Test.Utility;
1313
using Xunit;
14-
using Xunit.Abstractions;
1514

1615
namespace NuGet.CommandLine.FuncTest.Commands
1716
{

‎test/NuGet.Clients.FuncTests/NuGet.CommandLine.FuncTest/Commands/SignCommandTests.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
using NuGet.Packaging.Signing;
1414
using NuGet.Test.Utility;
1515
using Xunit;
16-
using Xunit.Abstractions;
1716
using HashAlgorithmName = NuGet.Common.HashAlgorithmName;
1817

1918
namespace NuGet.CommandLine.FuncTest.Commands

‎test/NuGet.Clients.FuncTests/NuGet.CommandLine.FuncTest/Commands/TrustedSignersCommandTests.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
using NuGet.Test.Utility;
2020
using Test.Utility.Signing;
2121
using Xunit;
22-
using Xunit.Abstractions;
2322
using static NuGet.Commands.TrustedSignersArgs;
2423

2524
namespace NuGet.CommandLine.FuncTest.Commands

0 commit comments

Comments
 (0)