Skip to content

Commit 491ed9a

Browse files
Update xunit version on release branch (#59277)
* update xunit version Conflicts: eng/Versions.props * Fix net461 issue * Apply PR feedback * Update src/libraries/Common/tests/TestUtilities/TestUtilities.csproj Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com> * Move PackageReference Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
1 parent 036cb86 commit 491ed9a

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@
158158
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.21404.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
159159
<MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.21404.1</MicrosoftDotNetXHarnessCLIVersion>
160160
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>1.0.2-alpha.0.21413.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
161-
<XUnitVersion>2.4.1</XUnitVersion>
161+
<XUnitVersion>2.4.2-pre.9</XUnitVersion>
162162
<XUnitRunnerVisualStudioVersion>2.4.2</XUnitRunnerVisualStudioVersion>
163163
<CoverletCollectorVersion>1.3.0</CoverletCollectorVersion>
164164
<NewtonsoftJsonVersion>12.0.3</NewtonsoftJsonVersion>

eng/testing/xunit/xunit.targets

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
<Project>
22
<ItemGroup>
33
<!-- Upgrade the NETStandard.Library transitive xunit dependency to avoid transitive 1.x NS dependencies. -->
4-
<PackageReference Include="NETStandard.Library"
5-
Version="$(NetStandardLibraryVersion)"
6-
Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'" />
4+
<PackageReference Include="NETStandard.Library" Version="$(NetStandardLibraryVersion)" />
75
</ItemGroup>
86

97
<!-- Run target (F5) support. -->

src/libraries/Common/tests/TestUtilities/TestUtilities.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,12 @@
8383
</ItemGroup>
8484
<ItemGroup>
8585
<PackageReference Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsVersion)" />
86+
<!-- Upgrade the NetStandard.Library transitive xunit dependency to avoid 1.x NS dependencies. -->
87+
<PackageReference Include="NETStandard.Library" Version="$(NetStandardLibraryVersion)" />
8688
<PackageReference Include="xunit.core" Version="$(XUnitVersion)" ExcludeAssets="build" />
8789
<PackageReference Include="xunit.assert" Version="$(XUnitVersion)" />
8890
</ItemGroup>
8991
<ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'">
90-
<!-- Upgrade the NetStandard.Library transitive xunit dependency to avoid 1.x NS dependencies. -->
91-
<PackageReference Include="NETStandard.Library" Version="$(NetStandardLibraryVersion)" />
9292
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj" PrivateAssets="all" />
9393
<ProjectReference Include="$(LibrariesProjectRoot)System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj" PrivateAssets="all" />
9494
</ItemGroup>

0 commit comments

Comments
 (0)