Skip to content

Commit 192075f

Browse files
Youssef1313Youssef1313
committed
Move to xunit.v3
1 parent 9db17fd commit 192075f

File tree

12 files changed

+18
-40
lines changed

12 files changed

+18
-40
lines changed

‎Directory.Build.props

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,10 @@
6666
<ExcludeByFile />
6767
</PropertyGroup>
6868

69+
<PropertyGroup>
70+
<TestRunnerName>XUnitV3</TestRunnerName>
71+
</PropertyGroup>
72+
6973
<!-- workaround for package downgrade in Microsoft.NetCore.Platforms -->
7074
<PropertyGroup>
7175
<DisableImplicitNETCorePlatformsReference>true</DisableImplicitNETCorePlatformsReference>

‎Directory.Packages.props

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@
3333
<PackageVersion Include="AwesomeAssertions" Version="$(AwesomeAssertionsVersion)" />
3434
<PackageVersion Include="Moq" Version="$(MoqPackageVersion)" />
3535
<PackageVersion Include="Microsoft.DotNet.RemoteExecutor" Version="$(MicrosoftDotNetRemoteExecutorVersion)" />
36-
<PackageVersion Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsPackageVersion)" />
36+
<PackageVersion Include="Microsoft.DotNet.XUnitV3Extensions" Version="$(MicrosoftDotNetXUnitV3ExtensionsPackageVersion)" />
3737
<PackageVersion Include="Microsoft.VisualStudio.Threading" Version="$(MicrosoftVisualStudioThreadingVersion)" />
38-
<PackageVersion Include="Verify.Xunit" Version="$(VerifyXunitVersion)" />
39-
<PackageVersion Include="xunit.assert" Version="$(XUnitAssertVersion)" Condition="'$(IsTestProject)' != 'true'" />
38+
<PackageVersion Include="Verify.Xunit" Version="$(VerifyXunitV3Version)" />
39+
<PackageVersion Include="xunit.v3.assert" Version="$(XUnitV3Version)" Condition="'$(IsTestProject)' != 'true'" />
4040
<PackageVersion Include="xunit.stafact" Version="$(XUnitStaFactPackageVersion)" />
4141

4242
<!-- Code coverage-->
@@ -50,10 +50,6 @@
5050
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="$(MicrosoftCodeAnalysisAnalyzersVersion)" />
5151
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="$(MicrosoftCodeAnalysisCommonPackageVersion)" />
5252
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpPackageVersion)" />
53-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit" Version="$(MicrosoftCodeAnalysisPackagesVersion)" />
54-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" Version="$(MicrosoftCodeAnalysisPackagesVersion)" />
55-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing.XUnit" Version="$(MicrosoftCodeAnalysisPackagesVersion)" />
56-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit" Version="$(MicrosoftCodeAnalysisPackagesVersion)" />
5753
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" Version="$(MicrosoftCodeAnalysisPackagesVersion)" />
5854
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" Version="$(MicrosoftCodeAnalysisPackagesVersion)" />
5955
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing" Version="$(MicrosoftCodeAnalysisPackagesVersion)" />
@@ -66,10 +62,6 @@
6662
<PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="$(MicrosoftCodeAnalysisNetAnalyzersVersion)" />
6763
<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="$(MicrosoftCodeAnalysisPublicApiAnalyzersVersion)" />
6864
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic" Version="$(MicrosoftCodeAnalysisCSharpPackageVersion)" />
69-
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Analyzer.Testing.XUnit" Version="$(MicrosoftCodeAnalysisPackagesVersion)" />
70-
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.XUnit" Version="$(MicrosoftCodeAnalysisPackagesVersion)" />
71-
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.CodeRefactoring.Testing.XUnit" Version="$(MicrosoftCodeAnalysisPackagesVersion)" />
72-
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.SourceGenerators.Testing.XUnit" Version="$(MicrosoftCodeAnalysisPackagesVersion)" />
7365
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="$(MicrosoftCodeAnalysisVisualBasicWorkspacesVersion)" />
7466
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="$(MicrosoftCodeAnalysisCSharpPackageVersion)" />
7567
<PackageVersion Include="NuGet.Packaging" Version="$(NugetPackagingVersion)" />

‎eng/Version.Details.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
103103
<Uri>https://github.com/dotnet/dotnet</Uri>
104104
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
105105
</Dependency>
106-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25276.103">
106+
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="10.0.0-beta.25276.103">
107107
<Uri>https://github.com/dotnet/dotnet</Uri>
108108
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
109109
</Dependency>

‎eng/Versions.props

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,18 +48,15 @@
4848
<PropertyGroup>
4949
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.25276.103</MicrosoftDotNetGenFacadesPackageVersion>
5050
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25276.103</MicrosoftDotNetRemoteExecutorVersion>
51-
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25276.103</MicrosoftDotNetXUnitExtensionsPackageVersion>
51+
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>10.0.0-beta.25276.103</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
5252
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
5353
</PropertyGroup>
5454
<!-- Below have no corresponding entries in Versions.Details.XML because they are not updated via Maestro -->
5555
<!-- XUnit-related (not extensions) -->
5656
<PropertyGroup>
57-
<XUnitVersion>2.9.2</XUnitVersion>
58-
<XUnitAssertVersion>$(XUnitVersion)</XUnitAssertVersion>
59-
<XUnitRunnerConsoleVersion>$(XUnitVersion)</XUnitRunnerConsoleVersion>
60-
<XUnitRunnerVisualStudioVersion>2.8.1</XUnitRunnerVisualStudioVersion>
61-
<XUnitExtensibilityExecutionVersion>$(XUnitVersion)</XUnitExtensibilityExecutionVersion>
62-
<XUnitStaFactPackageVersion>1.2.46-alpha</XUnitStaFactPackageVersion>
57+
<XUnitV3Version>2.0.2</XUnitV3Version>
58+
<XUnitRunnerVisualStudioVersion>3.1.0</XUnitRunnerVisualStudioVersion>
59+
<XUnitStaFactPackageVersion>2.1.7</XUnitStaFactPackageVersion>
6360
</PropertyGroup>
6461
<!-- Test related -->
6562
<PropertyGroup>
@@ -71,7 +68,7 @@
7168
<SystemComponentModelTypeConverterTestDataVersion>10.0.0-beta.24568.1</SystemComponentModelTypeConverterTestDataVersion>
7269
<SystemDrawingCommonTestDataVersion>10.0.0-beta.24568.1</SystemDrawingCommonTestDataVersion>
7370
<SystemWindowsExtensionsTestDataVersion>10.0.0-beta.24568.1</SystemWindowsExtensionsTestDataVersion>
74-
<VerifyXunitVersion>25.0.1</VerifyXunitVersion>
71+
<VerifyXunitV3Version>30.1.0</VerifyXunitV3Version>
7572
</PropertyGroup>
7673
<!-- Code Coverage -->
7774
<PropertyGroup>

‎eng/helixpublish.proj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
<EnableXUnitReporter>true</EnableXUnitReporter>
2424
<XUnitPublishTargetFramework>$(XUnitPublishTargetFramework)</XUnitPublishTargetFramework>
2525
<XUnitRuntimeTargetFramework>$(XUnitRuntimeTargetFramework)</XUnitRuntimeTargetFramework>
26-
<XUnitRunnerVersion>$(XUnitRunnerConsoleVersion)</XUnitRunnerVersion>
2726
</PropertyGroup>
2827

2928
<ItemGroup>

‎src/Common/tests/TestUtilities/System.Private.Windows.Core.TestUtilities.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
<ItemGroup>
1414
<PackageReference Include="AwesomeAssertions" />
1515
<PackageReference Include="Moq" />
16-
<PackageReference Include="xunit.assert" />
16+
<PackageReference Include="xunit.v3.assert" />
1717
<PackageReference Include="xunit.stafact" />
1818
<PackageReference Include="Microsoft.DotNet.RemoteExecutor" />
19-
<PackageReference Include="Microsoft.DotNet.XUnitExtensions" />
19+
<PackageReference Include="Microsoft.DotNet.XUnitV3Extensions" />
2020
<PackageReference Include="System.Formats.Nrbf" />
2121
</ItemGroup>
2222

‎src/Microsoft.VisualBasic/tests/UnitTests/Microsoft.VisualBasic.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.DotNet.XUnitExtensions" />
11+
<PackageReference Include="Microsoft.DotNet.XUnitV3Extensions" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

‎src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/System.Windows.Forms.Analyzers.CSharp.Tests.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@
1616
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" />
1717
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing" />
1818
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing" />
19-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit" />
20-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" />
21-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing.XUnit" />
22-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit" />
2319
<PackageReference Include="Verify.Xunit" />
2420
<PackageReference Include="NuGet.Packaging" />
2521
</ItemGroup>

‎src/System.Windows.Forms.Analyzers.VisualBasic/tests/UnitTests/System.Windows.Forms.Analyzers.VisualBasic.Tests/System.Windows.Forms.Analyzers.VisualBasic.Tests.vbproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@
1818
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing" />
1919
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.CodeRefactoring.Testing" />
2020
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.SourceGenerators.Testing" />
21-
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Analyzer.Testing.XUnit" />
22-
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.XUnit" />
23-
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.CodeRefactoring.Testing.XUnit" />
24-
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.SourceGenerators.Testing.XUnit" />
2521
<PackageReference Include="Verify.Xunit" />
2622
<PackageReference Include="NuGet.Packaging" />
2723
</ItemGroup>

‎src/System.Windows.Forms.Analyzers/tests/UnitTests/System.Windows.Forms.Analyzers.Tests.csproj

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,7 @@
1515
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" />
1616
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" />
1717
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing" />
18-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit" />
19-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" />
20-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing.XUnit" />
2118
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" />
22-
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Analyzer.Testing.XUnit" />
23-
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.XUnit" />
24-
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.CodeRefactoring.Testing.XUnit" />
2519
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Analyzer.Testing" />
2620
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing" />
2721
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.CodeRefactoring.Testing" />

‎src/System.Windows.Forms.Primitives/tests/TestUtilities/System.Windows.Forms.Primitives.TestUtilities.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<ItemGroup>
1414
<PackageReference Include="AwesomeAssertions" />
15-
<PackageReference Include="Microsoft.DotNet.XUnitExtensions" />
15+
<PackageReference Include="Microsoft.DotNet.XUnitV3Extensions" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

‎src/test/util/System.Windows.Forms/System.Windows.Forms.TestUtilities.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
<ItemGroup>
1111
<PackageReference Include="Microsoft.DotNet.RemoteExecutor" />
12-
<PackageReference Include="Microsoft.DotNet.XUnitExtensions" />
12+
<PackageReference Include="Microsoft.DotNet.XUnitV3Extensions" />
1313
</ItemGroup>
1414

1515
<ItemGroup>

0 commit comments

Comments
 (0)