@@ -266,13 +266,13 @@ function VerifyAssemblyVersionsAndSymbols() {
266
266
}
267
267
}
268
268
269
- function TestUsingNUnit ([string ] $testProject , [string ] $targetFramework , [boolean ] $noTestFilter = $false ) {
269
+ function TestUsingMSBuild ([string ] $testProject , [string ] $targetFramework , [ string ] $testadapterpath , [boolean ] $noTestFilter = $false ) {
270
270
$dotnetPath = InitializeDotNetCli
271
271
$dotnetExe = Join-Path $dotnetPath " dotnet.exe"
272
272
$projectName = [System.IO.Path ]::GetFileNameWithoutExtension($testProject )
273
273
$testLogPath = " $ArtifactsDir \TestResults\$configuration \${projectName} _$targetFramework .xml"
274
274
$testBinLogPath = " $LogDir \${projectName} _$targetFramework .binlog"
275
- $args = " test $testProject -c $configuration -f $targetFramework -v n --test-adapter-path . --logger "" nunit;LogFilePath=$testLogPath "" /bl:$testBinLogPath "
275
+ $args = " test $testProject -c $configuration -f $targetFramework -v n --test-adapter-path $testadapterpath --logger "" nunit;LogFilePath=$testLogPath "" /bl:$testBinLogPath "
276
276
277
277
if (-not $noVisualStudio -or $norestore ) {
278
278
$args += " --no-restore"
@@ -286,9 +286,18 @@ function TestUsingNUnit([string] $testProject, [string] $targetFramework, [boole
286
286
$args += " --filter TestCategory!=PullRequest"
287
287
}
288
288
289
+ Write-Host (" $args " )
289
290
Exec- Console $dotnetExe $args
290
291
}
291
292
293
+ function TestUsingXUnit ([string ] $testProject , [string ] $targetFramework , [string ]$testadapterpath ) {
294
+ TestUsingMsBuild - testProject $testProject - targetFramework $targetFramework - testadapterpath $testadapterpath - noTestFilter $false
295
+ }
296
+
297
+ function TestUsingNUnit ([string ] $testProject , [string ] $targetFramework , [string ]$testadapterpath ) {
298
+ TestUsingMsBuild - testProject $testProject - targetFramework $targetFramework - testadapterpath $testadapterpath - noTestFilter $true
299
+ }
300
+
292
301
function BuildCompiler () {
293
302
if ($bootstrapTfm -eq " netcoreapp3.1" ) {
294
303
$dotnetPath = InitializeDotNetCli
@@ -476,27 +485,27 @@ try {
476
485
$desktopTargetFramework = " net472"
477
486
$coreclrTargetFramework = " netcoreapp3.1"
478
487
479
- if ($testDesktop -and -not $noVisualStudio ) {
480
- TestUsingNUnit - testProject " $RepoRoot \tests\FSharp.Compiler.ComponentTests\FSharp.Compiler.ComponentTests.fsproj" - targetFramework $desktopTargetFramework - noTestFilter $true
481
- TestUsingNUnit - testProject " $RepoRoot \tests\FSharp.Compiler.UnitTests\FSharp.Compiler.UnitTests.fsproj" - targetFramework $desktopTargetFramework
482
- TestUsingNUnit - testProject " $RepoRoot \tests\FSharp.Compiler.Service.Tests\FSharp.Compiler.Service.Tests.fsproj" - targetFramework $desktopTargetFramework
483
- TestUsingNUnit - testProject " $RepoRoot \tests\FSharp.Compiler.Private.Scripting.UnitTests\FSharp.Compiler.Private.Scripting.UnitTests.fsproj" - targetFramework $desktopTargetFramework
484
- TestUsingNUnit - testProject " $RepoRoot \tests\FSharp.Build.UnitTests\FSharp.Build.UnitTests.fsproj" - targetFramework $desktopTargetFramework
485
- TestUsingNUnit - testProject " $RepoRoot \tests\FSharp.Core.UnitTests\FSharp.Core.UnitTests.fsproj" - targetFramework $desktopTargetFramework
486
- TestUsingNUnit - testProject " $RepoRoot \tests\fsharp\FSharpSuite.Tests.fsproj" - targetFramework $desktopTargetFramework
488
+ if ($testDesktop ) {
489
+ TestUsingXUnit - testProject " $RepoRoot \tests\FSharp.Compiler.ComponentTests\FSharp.Compiler.ComponentTests.fsproj" - targetFramework $desktopTargetFramework - testadapterpath " $ArtifactsDir \bin\FSharp.Compiler.ComponentTests\ " - noTestFilter $true
490
+ TestUsingNUnit - testProject " $RepoRoot \tests\FSharp.Compiler.UnitTests\FSharp.Compiler.UnitTests.fsproj" - targetFramework $desktopTargetFramework - testadapterpath " $ArtifactsDir \bin\FSharp.Compiler.UnitTests\ "
491
+ TestUsingNUnit - testProject " $RepoRoot \tests\FSharp.Compiler.Service.Tests\FSharp.Compiler.Service.Tests.fsproj" - targetFramework $desktopTargetFramework - testadapterpath " $ArtifactsDir \bin\FSharp.Compiler.Service.Tests\ "
492
+ TestUsingXUnit - testProject " $RepoRoot \tests\FSharp.Compiler.Private.Scripting.UnitTests\FSharp.Compiler.Private.Scripting.UnitTests.fsproj" - targetFramework $desktopTargetFramework - testadapterpath " $ArtifactsDir \bin\FSharp.Compiler.Private.Scripting.UnitTests\ "
493
+ TestUsingNUnit - testProject " $RepoRoot \tests\FSharp.Build.UnitTests\FSharp.Build.UnitTests.fsproj" - targetFramework $desktopTargetFramework - testadapterpath " $ArtifactsDir \bin\FSharp.Build.UnitTests\ "
494
+ TestUsingNUnit - testProject " $RepoRoot \tests\FSharp.Core.UnitTests\FSharp.Core.UnitTests.fsproj" - targetFramework $desktopTargetFramework - testadapterpath " $ArtifactsDir \bin\FSharp.Core.UnitTests\ "
495
+ TestUsingNUnit - testProject " $RepoRoot \tests\fsharp\FSharpSuite.Tests.fsproj" - targetFramework $desktopTargetFramework - testadapterpath " $ArtifactsDir \bin\FSharpSuite.Tests\ "
487
496
}
488
497
489
498
if ($testCoreClr ) {
490
- TestUsingNUnit - testProject " $RepoRoot \tests\FSharp.Compiler.ComponentTests\FSharp.Compiler.ComponentTests.fsproj" - targetFramework $coreclrTargetFramework - noTestFilter $true
491
- TestUsingNUnit - testProject " $RepoRoot \tests\FSharp.Compiler.UnitTests\FSharp.Compiler.UnitTests.fsproj" - targetFramework $coreclrTargetFramework
492
- TestUsingNUnit - testProject " $RepoRoot \tests\FSharp.Compiler.Service.Tests\FSharp.Compiler.Service.Tests.fsproj" - targetFramework $coreclrTargetFramework
493
- TestUsingNUnit - testProject " $RepoRoot \tests\FSharp.Compiler.Private.Scripting.UnitTests\FSharp.Compiler.Private.Scripting.UnitTests.fsproj" - targetFramework $coreclrTargetFramework
494
- TestUsingNUnit - testProject " $RepoRoot \tests\FSharp.Build.UnitTests\FSharp.Build.UnitTests.fsproj" - targetFramework $coreclrTargetFramework
495
- TestUsingNUnit - testProject " $RepoRoot \tests\FSharp.Core.UnitTests\FSharp.Core.UnitTests.fsproj" - targetFramework $coreclrTargetFramework
496
- TestUsingNUnit - testProject " $RepoRoot \tests\fsharp\FSharpSuite.Tests.fsproj" - targetFramework $coreclrTargetFramework
499
+ TestUsingXUnit - testProject " $RepoRoot \tests\FSharp.Compiler.ComponentTests\FSharp.Compiler.ComponentTests.fsproj" - targetFramework $coreclrTargetFramework - testadapterpath " $ArtifactsDir \bin\FSharp.Compiler.ComponentTests\ "
500
+ TestUsingNUnit - testProject " $RepoRoot \tests\FSharp.Compiler.UnitTests\FSharp.Compiler.UnitTests.fsproj" - targetFramework $coreclrTargetFramework - testadapterpath " $ArtifactsDir \bin\FSharp.Compiler.UnitTests\ "
501
+ TestUsingNUnit - testProject " $RepoRoot \tests\FSharp.Compiler.Service.Tests\FSharp.Compiler.Service.Tests.fsproj" - targetFramework $coreclrTargetFramework - testadapterpath " $ArtifactsDir \bin\FSharp.Compiler.Service.Tests\ "
502
+ TestUsingXUnit - testProject " $RepoRoot \tests\FSharp.Compiler.Private.Scripting.UnitTests\FSharp.Compiler.Private.Scripting.UnitTests.fsproj" - targetFramework $coreclrTargetFramework - testadapterpath " $ArtifactsDir \bin\FSharp.Compiler.Private.Scripting.UnitTests\ "
503
+ TestUsingNUnit - testProject " $RepoRoot \tests\FSharp.Build.UnitTests\FSharp.Build.UnitTests.fsproj" - targetFramework $coreclrTargetFramework - testadapterpath " $ArtifactsDir \bin\FSharp.Build.UnitTests\ "
504
+ TestUsingNUnit - testProject " $RepoRoot \tests\FSharp.Core.UnitTests\FSharp.Core.UnitTests.fsproj" - targetFramework $coreclrTargetFramework - testadapterpath " $ArtifactsDir \bin\FSharp.Core.UnitTests\ "
505
+ TestUsingNUnit - testProject " $RepoRoot \tests\fsharp\FSharpSuite.Tests.fsproj" - targetFramework $coreclrTargetFramework - testadapterpath " $ArtifactsDir \bin\FSharpSuite.Tests\ "
497
506
}
498
507
499
- if ($testFSharpQA -and -not $noVisualStudio ) {
508
+ if ($testFSharpQA ) {
500
509
Push-Location " $RepoRoot \tests\fsharpqa\source"
501
510
$nugetPackages = Get-PackagesDir
502
511
$resultsRoot = " $ArtifactsDir \TestResults\$configuration "
@@ -518,45 +527,29 @@ try {
518
527
}
519
528
520
529
if ($testFSharpCore ) {
521
- if (-not $noVisualStudio ) {
522
- TestUsingNUnit - testProject " $RepoRoot \tests\FSharp.Core.UnitTests\FSharp.Core.UnitTests.fsproj" - targetFramework $desktopTargetFramework
523
- }
524
- TestUsingNUnit - testProject " $RepoRoot \tests\FSharp.Core.UnitTests\FSharp.Core.UnitTests.fsproj" - targetFramework $coreclrTargetFramework
530
+ TestUsingNUnit - testProject " $RepoRoot \tests\FSharp.Core.UnitTests\FSharp.Core.UnitTests.fsproj" - targetFramework $coreclrTargetFramework - testadapterpath " $ArtifactsDir \bin\FSharp.Core.UnitTests\"
525
531
}
526
532
527
533
if ($testCompiler ) {
528
- if (-not $noVisualStudio ) {
529
- TestUsingNUnit - testProject " $RepoRoot \tests\FSharp.Compiler.ComponentTests\FSharp.Compiler.ComponentTests.fsproj" - targetFramework $desktopTargetFramework - noTestFilter $true
530
- TestUsingNUnit - testProject " $RepoRoot \tests\FSharp.Compiler.UnitTests\FSharp.Compiler.UnitTests.fsproj" - targetFramework $desktopTargetFramework
531
- }
532
- TestUsingNUnit - testProject " $RepoRoot \tests\FSharp.Compiler.ComponentTests\FSharp.Compiler.ComponentTests.fsproj" - targetFramework $coreclrTargetFramework - noTestFilter $true
533
- TestUsingNUnit - testProject " $RepoRoot \tests\FSharp.Compiler.UnitTests\FSharp.Compiler.UnitTests.fsproj" - targetFramework $coreclrTargetFramework
534
+ TestUsingNUnit - testProject " $RepoRoot \tests\FSharp.Compiler.ComponentTests\FSharp.Compiler.ComponentTests.fsproj" - targetFramework $coreclrTargetFramework - noTestFilter $true - testadapterpath " $ArtifactsDir \bin\FSharp.Compiler.ComponentTests\"
535
+ TestUsingNUnit - testProject " $RepoRoot \tests\FSharp.Compiler.UnitTests\FSharp.Compiler.UnitTests.fsproj" - targetFramework $coreclrTargetFramework - testadapterpath " $ArtifactsDir \bin\FSharp.Compiler.UnitTests\"
534
536
}
535
537
536
538
if ($testCompilerService ) {
537
- if (-not $noVisualStudio ) {
538
- TestUsingNUnit - testProject " $RepoRoot \tests\FSharp.Compiler.Service.Tests\FSharp.Compiler.Service.Tests.fsproj" - targetFramework $desktopTargetFramework
539
- }
540
- TestUsingNUnit - testProject " $RepoRoot \tests\FSharp.Compiler.Service.Tests\FSharp.Compiler.Service.Tests.fsproj" - targetFramework $coreclrTargetFramework
539
+ TestUsingNUnit - testProject " $RepoRoot \tests\FSharp.Compiler.Service.Tests\FSharp.Compiler.Service.Tests.fsproj" - targetFramework $coreclrTargetFramework - testadapterpath " $ArtifactsDir \bin\FSharp.Compiler.Service.Tests\"
541
540
}
542
541
543
542
if ($testCambridge ) {
544
- if (-not $noVisualStudio ) {
545
- TestUsingNUnit - testProject " $RepoRoot \tests\fsharp\FSharpSuite.Tests.fsproj" - targetFramework $desktopTargetFramework
546
- }
547
- TestUsingNUnit - testProject " $RepoRoot \tests\fsharp\FSharpSuite.Tests.fsproj" - targetFramework $coreclrTargetFramework
543
+ TestUsingNUnit - testProject " $RepoRoot \tests\fsharp\FSharpSuite.Tests.fsproj" - targetFramework $coreclrTargetFramework - testadapterpath " $ArtifactsDir \bin\FSharpSuite.Tests\"
548
544
}
549
545
550
546
if ($testScripting ) {
551
- if (-not $noVisualStudio ) {
552
- TestUsingNUnit - testProject " $RepoRoot \tests\FSharp.Compiler.Private.Scripting.UnitTests\FSharp.Compiler.Private.Scripting.UnitTests.fsproj" - targetFramework $desktopTargetFramework
553
- }
554
- TestUsingNUnit - testProject " $RepoRoot \tests\FSharp.Compiler.Private.Scripting.UnitTests\FSharp.Compiler.Private.Scripting.UnitTests.fsproj" - targetFramework $coreclrTargetFramework
547
+ TestUsingNUnit - testProject " $RepoRoot \tests\FSharp.Compiler.Private.Scripting.UnitTests\FSharp.Compiler.Private.Scripting.UnitTests.fsproj" - targetFramework $coreclrTargetFramework - testadapterpath " $ArtifactsDir \bin\FSharp.Compiler.Private.Scripting.UnitTests\"
555
548
}
556
549
557
550
if ($testVs -and -not $noVisualStudio ) {
558
- TestUsingNUnit - testProject " $RepoRoot \vsintegration\tests\GetTypesVS.UnitTests\GetTypesVS.UnitTests.fsproj" - targetFramework $desktopTargetFramework
559
- TestUsingNUnit - testProject " $RepoRoot \vsintegration\tests\UnitTests\VisualFSharp.UnitTests.fsproj" - targetFramework $desktopTargetFramework
551
+ TestUsingNUnit - testProject " $RepoRoot \vsintegration\tests\GetTypesVS.UnitTests\GetTypesVS.UnitTests.fsproj" - targetFramework $desktopTargetFramework - testadapterpath " $ArtifactsDir \bin\GetTypesVS.UnitTests "
552
+ TestUsingNUnit - testProject " $RepoRoot \vsintegration\tests\UnitTests\VisualFSharp.UnitTests.fsproj" - targetFramework $desktopTargetFramework - testadapterpath " $ArtifactsDir \bin\VisualFSharp.UnitTests "
560
553
}
561
554
562
555
# verify nupkgs have access to the source code
0 commit comments