Skip to content

Commit 7503f44

Browse files
KevinRansombaronfel
authored andcommitted
Always build FSharp.Core.UnitTests against the FSharp.Core in the repository (#6384)
1 parent 1e2ce45 commit 7503f44

File tree

2 files changed

+14
-0
lines changed

2 files changed

+14
-0
lines changed

FSharpBuild.Directory.Build.props

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
<Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
44
<Import Project="eng\targets\Settings.props" />
55

6+
<PropertyGroup>
7+
<BUILD_IN_FSHARP_REPOSITORY>true</BUILD_IN_FSHARP_REPOSITORY>
8+
</PropertyGroup>
9+
610
<!-- directory locations -->
711
<PropertyGroup>
812
<FSharpSourcesRoot>$(RepoRoot)src</FSharpSourcesRoot>

eng/Build.ps1

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ param (
4646
[switch][Alias('test')]$testDesktop,
4747
[switch]$testCoreClr,
4848
[switch]$testFSharpQA,
49+
[switch]$testFSharpCore,
4950
[switch]$testVs,
5051
[switch]$testAll,
5152

@@ -76,6 +77,7 @@ function Print-Usage() {
7677
Write-Host " -testDesktop Run tests against full .NET Framework"
7778
Write-Host " -testCoreClr Run tests against CoreCLR"
7879
Write-Host " -testFSharpQA Run F# Cambridge tests"
80+
Write-Host " -testFSharpCore Run FSharpCore unit tests"
7981
Write-Host " -testVs Run F# editor unit tests"
8082
Write-Host ""
8183
Write-Host "Advanced settings:"
@@ -271,6 +273,14 @@ try {
271273
Pop-Location
272274
}
273275

276+
if ($testFSharpCore) {
277+
Write-Host "Environment Variables"
278+
Get-Childitem Env:
279+
TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Core.UnitTests\FSharp.Core.UnitTests.fsproj" -targetFramework $desktopTargetFramework
280+
TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Core.UnitTests\FSharp.Core.UnitTests.fsproj" -targetFramework $coreclrTargetFramework
281+
}
282+
283+
274284
if ($testVs) {
275285
Write-Host "Environment Variables"
276286
Get-Childitem Env:

0 commit comments

Comments
 (0)