[WIP] Migrate Compiler.UnitTests to xUnit

Author: vzarytovskii

FSharpBuild.Directory.Build.props

@@ -10,6 +10,7 @@
   <!-- directory locations -->
   <PropertyGroup>
     <FSharpSourcesRoot>$(RepoRoot)src</FSharpSourcesRoot>
+    <FSharpTestsRoot>$(RepoRoot)tests</FSharpTestsRoot>
     <SymStoreDirectory>$(ArtifactsDir)\SymStore</SymStoreDirectory>
     <ProtoOutputPath>$(ArtifactsDir)\Bootstrap</ProtoOutputPath>
     <ValueTupleImplicitPackageVersion>4.4.0</ValueTupleImplicitPackageVersion>

eng/Versions.props

@@ -187,6 +187,6 @@
     <StrawberryPerlVersion>5.28.0.1</StrawberryPerlVersion>
     <StreamJsonRpcVersion>2.0.187</StreamJsonRpcVersion>
     <XUnitVersion>2.4.1</XUnitVersion>
-    <FluentAssertionsVersion>2.4.1</FluentAssertionsVersion>
+    <FluentAssertionsVersion>5.10.3</FluentAssertionsVersion>
   </PropertyGroup>
 </Project>

tests/Directory.Build.targets

@@ -9,7 +9,7 @@
     <PackageReference Include="NunitXml.TestLogger" Version="$(NunitXmlTestLoggerVersion)" />
   </ItemGroup>
   <ItemGroup Condition="'$(UnitTestType)' == 'xunit'">
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkVersion)" />
+    <!-- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkVersion)" /> -->
     <PackageReference Include="xunit" Version="$(XUnitVersion)" />
     <PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitVersion)" />
     <PackageReference Include="NunitXml.TestLogger" Version="$(NunitXmlTestLoggerVersion)" />

tests/FSharp.Compiler.UnitTests/EditDistance.fs

@@ -22,6 +22,6 @@ module EditDistance =
     [<InlineData("RICK", "RICK", 0)>]
     [<InlineData("MARTHA", "MARHTA", 1)>]
     [<InlineData("'T", "'u", 1)>]
-    let EditDistanceTest (str1 : string, str2 : string, expected : string) : unit =
+    let EditDistanceTest (str1 : string, str2 : string, expected : int) : unit =
         CalcEditDistance(str1,str2)
         |> Assert.shouldBe expected

tests/FSharp.Compiler.UnitTests/FSharp.Compiler.UnitTests.fsproj

@@ -8,6 +8,7 @@
     <OutputType>Library</OutputType>
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
     <UnitTestType>xunit</UnitTestType>
+    <NoWarn>$(NoWarn);3186;1104;NETSDK1023</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
@@ -24,6 +25,7 @@
   <ItemGroup>
     <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Private\FSharp.Compiler.Private.fsproj" />
     <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj" />
+    <ProjectReference Include="$(FSharpTestsRoot)\FSharp.Test.Utilities\FSharp.Test.Utilities.fsproj" />
   </ItemGroup>
 
 </Project>