Always build FSharp.Core.UnitTests against the FSharp.Core in the rep…

…ository (#6384)
dotnet · Mar 28, 2019 · 65461d7 · 65461d7
1 parent a8080a6
commit 65461d7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/FSharpBuild.Directory.Build.props b/FSharpBuild.Directory.Build.props
@@ -3,6 +3,10 @@
   <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
   <Import Project="eng\targets\Settings.props" />
 
+  <PropertyGroup>
+    <BUILD_IN_FSHARP_REPOSITORY>true</BUILD_IN_FSHARP_REPOSITORY>
+  </PropertyGroup>
+
   <!-- directory locations -->
   <PropertyGroup>
     <FSharpSourcesRoot>$(RepoRoot)src</FSharpSourcesRoot>

diff --git a/eng/Build.ps1 b/eng/Build.ps1
@@ -46,6 +46,7 @@ param (
     [switch][Alias('test')]$testDesktop,
     [switch]$testCoreClr,
     [switch]$testFSharpQA,
+    [switch]$testFSharpCore,
     [switch]$testVs,
     [switch]$testAll,
 
@@ -76,6 +77,7 @@ function Print-Usage() {
     Write-Host "  -testDesktop              Run tests against full .NET Framework"
     Write-Host "  -testCoreClr              Run tests against CoreCLR"
     Write-Host "  -testFSharpQA             Run F# Cambridge tests"
+    Write-Host "  -testFSharpCore           Run FSharpCore unit tests"
     Write-Host "  -testVs                   Run F# editor unit tests"
     Write-Host ""
     Write-Host "Advanced settings:"
@@ -271,6 +273,14 @@ try {
         Pop-Location
     }
 
+    if ($testFSharpCore) {
+        Write-Host "Environment Variables"
+        Get-Childitem Env:
+        TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Core.UnitTests\FSharp.Core.UnitTests.fsproj" -targetFramework $desktopTargetFramework
+        TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Core.UnitTests\FSharp.Core.UnitTests.fsproj" -targetFramework $coreclrTargetFramework
+    }
+
+
     if ($testVs) {
         Write-Host "Environment Variables"
         Get-Childitem Env: