Skip to content
This repository was archived by the owner on Dec 23, 2024. It is now read-only.

Commit 50b095e

Browse files
KevinRansomnosami
authored andcommitted
Switch FSharp.Core.Unit tests to use Xunit (dotnet#9992)
1 parent aba535c commit 50b095e

Some content is hidden

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

56 files changed

+6653
-6768
lines changed

tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<LangVersion>preview</LangVersion>
2222

2323
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
24-
<UnitTestType>nunit</UnitTestType>
24+
<UnitTestType>xunit</UnitTestType>
2525
<IsTestProject>true</IsTestProject>
2626
<IsPackable>true</IsPackable>
2727
<PackageLicenseExpression>MIT</PackageLicenseExpression>
@@ -38,7 +38,7 @@
3838
</PropertyGroup>
3939

4040
<ItemGroup>
41-
<Compile Include="NUnitFrameworkShims.fs" />
41+
<Compile Include="TestFrameworkHelpers.fs" />
4242
<Compile Include="LibraryTestFx.fs" />
4343
<Compile Include="FSharp.Core\PrimTypes.fs" />
4444
<Compile Include="FSharp.Core\ComparersRegression.fs" />
@@ -95,21 +95,13 @@
9595
<Compile Include="SurfaceArea.fs" />
9696
</ItemGroup>
9797

98-
<ItemGroup />
99-
100-
<ItemGroup Condition="'$(BUILD_IN_FSHARP_REPOSITORY)' == 'true'">
101-
<ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj" />
102-
<PackageReference Include="FsCheck" Version="$(FsCheckVersion)" />
98+
<ItemGroup>
99+
<Content Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
103100
</ItemGroup>
104101

105-
<ItemGroup Condition="'$(BUILD_IN_FSHARP_REPOSITORY)' != 'true'">
106-
<PackageReference Include="FSharp.Core" Version="4.6.0" />
107-
<PackageReference Include="FsCheck" Version="3.0.0-alpha4" />
108-
</ItemGroup>
109102

110-
<ItemGroup Condition="'$(UnitTestType)' == 'xunit'">
111-
<PackageReference Include="xunit" Version="2.4.1" PrivateAssets="All" />
112-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" />
103+
<ItemGroup>
104+
<ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj" />
105+
<PackageReference Include="FsCheck" Version="$(FsCheckVersion)" />
113106
</ItemGroup>
114-
115107
</Project>

0 commit comments

Comments
 (0)