Skip to content

Commit f2e57ba

Browse files
committed
Migrate to xunit.v3
1 parent cf1564f commit f2e57ba

File tree

3 files changed

+5
-16
lines changed

3 files changed

+5
-16
lines changed

Directory.Build.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<TargetFrameworkVersion>10.0</TargetFrameworkVersion>
88
<BuildWithNetFrameworkHostedCompiler>true</BuildWithNetFrameworkHostedCompiler>
99
<PublishWindowsPdb>false</PublishWindowsPdb>
10+
<TestRunnerName>XUnitV3</TestRunnerName>
1011
</PropertyGroup>
1112
<!-- Normalize $(TestWpfArcadeSdkPath) by appending a '\' to it if one is missing -->
1213
<PropertyGroup Condition="'$(TestWpfArcadeSdkPath)'!=''">

eng/Versions.props

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,8 @@
8989
</PropertyGroup>
9090
<!-- XUnit-related (not extensions) -->
9191
<PropertyGroup>
92-
<XUnitVersion>2.9.2</XUnitVersion>
93-
<XUnitAssertVersion>$(XUnitVersion)</XUnitAssertVersion>
94-
<XUnitRunnerConsoleVersion>$(XUnitVersion)</XUnitRunnerConsoleVersion>
95-
<XUnitRunnerVisualStudioVersion>2.8.1</XUnitRunnerVisualStudioVersion>
96-
<XUnitExtensibilityExecutionVersion>$(XUnitVersion)</XUnitExtensibilityExecutionVersion>
97-
<XUnitStaFactPackageVersion>1.2.46-alpha</XUnitStaFactPackageVersion>
92+
<XUnitV3Version>2.0.2</XUnitV3Version>
93+
<XUnitStaFactPackageVersion>2.1.7</XUnitStaFactPackageVersion>
9894
</PropertyGroup>
9995
<!-- Test related -->
10096
<PropertyGroup>
@@ -103,7 +99,7 @@
10399
<SystemComponentModelTypeConverterTestDataVersion>8.0.0-beta.23107.1</SystemComponentModelTypeConverterTestDataVersion>
104100
<SystemDrawingCommonTestDataVersion>8.0.0-beta.23107.1</SystemDrawingCommonTestDataVersion>
105101
<SystemWindowsExtensionsTestDataVersion>8.0.0-beta.23107.1</SystemWindowsExtensionsTestDataVersion>
106-
<VerifyXunitVersion>14.2.0</VerifyXunitVersion>
102+
<VerifyXunitV3Version>30.1.0</VerifyXunitV3Version>
107103
<!-- Shared test utilities with WinForms -->
108104
<SystemPrivateWindowsCoreTestUtilitiesVersion>10.0.0-alpha.1.24571.3</SystemPrivateWindowsCoreTestUtilitiesVersion>
109105
</PropertyGroup>

src/Microsoft.DotNet.Wpf/tests/IntegrationTests/MultiTargeting.props

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,6 @@
1313
to true.
1414
-->
1515
<ItemGroup Condition="'$(IsUnitTestProject)'!='true' and '$(IsXUnitProject)'=='true'">
16-
<PackageReference Include="xunit" Version="$(XUnitVersion)" />
17-
<PackageReference Include="xunit.runner.console" Version="$(XUnitRunnerConsoleVersion)">
18-
<PrivateAssets>all</PrivateAssets>
19-
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
20-
</PackageReference>
21-
<PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitRunnerVisualStudioVersion)">
22-
<PrivateAssets>all</PrivateAssets>
23-
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
24-
</PackageReference>
16+
<PackageReference Include="xunit.v3" Version="$(XUnitV3Version)" />
2517
</ItemGroup>
2618
</Project>

0 commit comments

Comments
 (0)