Skip to content

Commit

Permalink
Switch FSharp.Core.Unit tests to use Xunit (#9992)
Browse files Browse the repository at this point in the history
  • Loading branch information
KevinRansom authored Aug 24, 2020
1 parent 7f1d2f8 commit f859a6c
Show file tree
Hide file tree
Showing 56 changed files with 6,604 additions and 6,724 deletions.
22 changes: 7 additions & 15 deletions tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<LangVersion>preview</LangVersion>

<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
<UnitTestType>nunit</UnitTestType>
<UnitTestType>xunit</UnitTestType>
<IsTestProject>true</IsTestProject>
<IsPackable>true</IsPackable>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
Expand All @@ -31,7 +31,7 @@
</PropertyGroup>

<ItemGroup>
<Compile Include="NUnitFrameworkShims.fs" />
<Compile Include="TestFrameworkHelpers.fs" />
<Compile Include="LibraryTestFx.fs" />
<Compile Include="FSharp.Core\PrimTypes.fs" />
<Compile Include="FSharp.Core\ComparersRegression.fs" />
Expand Down Expand Up @@ -88,21 +88,13 @@
<Compile Include="SurfaceArea.fs" />
</ItemGroup>

<ItemGroup />

<ItemGroup Condition="'$(BUILD_IN_FSHARP_REPOSITORY)' == 'true'">
<ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj" />
<PackageReference Include="FsCheck" Version="$(FsCheckVersion)" />
<ItemGroup>
<Content Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>

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

<ItemGroup Condition="'$(UnitTestType)' == 'xunit'">
<PackageReference Include="xunit" Version="2.4.1" PrivateAssets="All" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" />
<ItemGroup>
<ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj" />
<PackageReference Include="FsCheck" Version="$(FsCheckVersion)" />
</ItemGroup>

</Project>
Loading

0 comments on commit f859a6c

Please sign in to comment.