[WIP] Moving to xUnit

Author: vzarytovskii

eng/Versions.props

@@ -176,7 +176,7 @@
     <MicrosoftNetCompilersVersion>2.7.0</MicrosoftNetCompilersVersion>
     <MicrosoftNETCoreILDAsmVersion>3.0.0-preview-27318-01</MicrosoftNETCoreILDAsmVersion>
     <MicrosoftNETCoreILAsmVersion>3.0.0-preview-27318-01</MicrosoftNETCoreILAsmVersion>
-    <MicrosoftNETTestSdkVersion>15.8.0</MicrosoftNETTestSdkVersion>
+    <MicrosoftNETTestSdkVersion>16.6.1</MicrosoftNETTestSdkVersion>
     <MicrosoftWin32RegistryVersion>4.3.0</MicrosoftWin32RegistryVersion>
     <NewtonsoftJsonVersion>9.0.1</NewtonsoftJsonVersion>
     <NUnitVersion>3.11.0</NUnitVersion>
@@ -186,5 +186,7 @@
     <RoslynToolsSignToolVersion>1.0.0-beta2-dev3</RoslynToolsSignToolVersion>
     <StrawberryPerlVersion>5.28.0.1</StrawberryPerlVersion>
     <StreamJsonRpcVersion>2.0.187</StreamJsonRpcVersion>
+    <XUnitVersion>2.4.1</XUnitVersion>
+    <FluentAssertionsVersion>2.4.1</FluentAssertionsVersion>
   </PropertyGroup>
 </Project>

tests/Directory.Build.targets

@@ -8,5 +8,11 @@
     <PackageReference Include="NUnit3TestAdapter" Version="$(NUnit3TestAdapterVersion)" />
     <PackageReference Include="NunitXml.TestLogger" Version="$(NunitXmlTestLoggerVersion)" />
   </ItemGroup>
+  <ItemGroup Condition="'$(UnitTestType)' == 'xunit'">
+    <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)" />
+  </ItemGroup>
 
 </Project>

…sts/FSharp.TestHelpers/CompilerAssert.fs …/FSharp.Test.Utilities/CompilerAssert.fstests/FSharp.TestHelpers/CompilerAssert.fs renamed to tests/FSharp.Test.Utilities/CompilerAssert.fs tests/FSharp.TestHelpers/CompilerAssert.fs renamed to tests/FSharp.Test.Utilities/CompilerAssert.fs

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.TestHelpers
+namespace FSharp.Test.Utilities
 
 open System
 open System.Diagnostics
@@ -19,7 +19,7 @@ open NUnit.Framework
 open System.Reflection.Emit
 open Microsoft.CodeAnalysis
 open Microsoft.CodeAnalysis.CSharp
-open FSharp.TestHelpers.Utilities
+open FSharp.Test.Utilities.Utilities
 
 [<Sealed>]
 type ILVerifier (dllFilePath: string) =

…FSharp.TestHelpers/Directory.Build.props …arp.Test.Utilities/Directory.Build.propstests/FSharp.TestHelpers/Directory.Build.props renamed to tests/FSharp.Test.Utilities/Directory.Build.props tests/FSharp.TestHelpers/Directory.Build.props renamed to tests/FSharp.Test.Utilities/Directory.Build.props

@@ -39,6 +39,7 @@
     <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="$(MicrosoftCodeAnalysisWorkspacesCommonVersion)" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpVersion)" />
     <PackageReference Include="Microsoft.CodeAnalysis.Test.Resources.Proprietary" Version="$(MicrosoftCodeAnalysisTestResourcesProprietaryVersion)" />
-    <PackageReference Include="NUnit" Version="$(NUnitVersion)" />
+    <PackageReference Include="NUnit" Version="$(NUnitVersion)" /> <!-- TODO: This should be removed once all NUnit frameworks are migrated to xUnit -->
+    <PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
   </ItemGroup>
 </Project>

…rp.TestHelpers/FSharp.TestHelpers.fsproj …Test.Utilities/FSharp.TestHelpers.fsprojtests/FSharp.TestHelpers/FSharp.TestHelpers.fsproj renamed to tests/FSharp.Test.Utilities/FSharp.TestHelpers.fsproj tests/FSharp.TestHelpers/FSharp.TestHelpers.fsproj renamed to tests/FSharp.Test.Utilities/FSharp.TestHelpers.fsproj

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.TestHelpers
+namespace FSharp.Test.Utilities
 
 open System
 open System.IO

tests/FSharp.TestHelpers/ILChecker.fs tests/FSharp.Test.Utilities/ILChecker.fstests/FSharp.TestHelpers/ILChecker.fs renamed to tests/FSharp.Test.Utilities/ILChecker.fs

@@ -1,14 +1,14 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 
-namespace FSharp.TestHelpers
+namespace FSharp.Test.Utilities
 
 open System
 open System.IO
 open System.Collections.Immutable
 open Microsoft.CodeAnalysis
 open Microsoft.CodeAnalysis.CSharp
 open System.Diagnostics
-open FSharp.TestHelpers
+open FSharp.Test.Utilities
 
 // This file mimics how Roslyn handles their compilation references for compilation testing