Test fsharp script improvement

dotnet/fsharp#18491

Author: ViktorHofer

src/fsharp/eng/Build.ps1

@@ -68,7 +68,7 @@ param (
     [switch]$testBenchmarks,
     [string]$officialSkipTests = "false",
     [switch]$noVisualStudio,
-    [switch]$sourceBuild,
+    [switch][Alias('pb')]$productBuild,
     [switch]$skipBuild,
     [switch]$compressAllMetadata,
     [switch]$buildnorealsig = $true,
@@ -133,7 +133,7 @@ function Print-Usage() {
     Write-Host "  -prepareMachine               Prepare machine for CI run, clean up processes after build"
     Write-Host "  -dontUseGlobalNuGetCache      Do not use the global NuGet cache"
     Write-Host "  -noVisualStudio               Only build fsc and fsi as .NET Core applications. No Visual Studio required. '-configuration', '-verbosity', '-norestore', '-rebuild' are supported."
-    Write-Host "  -sourceBuild                  Simulate building for source-build."
+    Write-Host "  -productBuild                 Build the repository in product-build mode."
     Write-Host "  -skipbuild                    Skip building product"
     Write-Host "  -compressAllMetadata          Build product with compressed metadata"
     Write-Host "  -buildnorealsig               Build product with realsig- (default use realsig+, where necessary)"
@@ -218,10 +218,6 @@ function Process-Arguments() {
         $script:pack = $True;
     }
 
-    if ($sourceBuild) {
-        $script:testpack = $False;
-    }
-
     if ($noBinaryLog) {
         $script:binaryLog = $False;
     }
@@ -278,7 +274,7 @@ function Update-Arguments() {
 }
 
 
-function BuildSolution([string] $solutionName, $nopack) {
+function BuildSolution([string] $solutionName, $packSolution) {
         Write-Host "${solutionName}:"
 
     $bl = if ($binaryLog) { "/bl:" + (Join-Path $LogDir "Build.$solutionName.binlog") } else { "" }
@@ -292,13 +288,11 @@ function BuildSolution([string] $solutionName, $nopack) {
     # Do not set the property to true explicitly, since that would override value projects might set.
     $suppressExtensionDeployment = if (!$deployExtensions) { "/p:DeployExtension=false" } else { "" }
 
-    $sourceBuildArgs = if ($sourceBuild) { "/p:DotNetBuildSourceOnly=true /p:DotNetBuildRepo=true" } else { "" }
-
     $BUILDING_USING_DOTNET_ORIG = $env:BUILDING_USING_DOTNET
 
     $env:BUILDING_USING_DOTNET="false"
 
-    $pack = if ($nopack -eq $False) {""} else {$pack}
+    $pack = if ($packSolution -eq $False) {""} else {$pack}
 
     MSBuild $toolsetBuildProj `
         $bl `
@@ -307,6 +301,7 @@ function BuildSolution([string] $solutionName, $nopack) {
         /p:RepoRoot=$RepoRoot `
         /p:Restore=$restore `
         /p:Build=$build `
+        /p:DotNetBuildRepo=$productBuild `
         /p:Rebuild=$rebuild `
         /p:Pack=$pack `
         /p:Sign=$sign `
@@ -319,7 +314,6 @@ function BuildSolution([string] $solutionName, $nopack) {
         /p:CompressAllMetadata=$CompressAllMetadata `
         /p:BuildNoRealsig=$buildnorealsig `
         /v:$verbosity `
-        $sourceBuildArgs `
         $suppressExtensionDeployment `
         @properties
 
@@ -567,7 +561,7 @@ try {
     }
 
     $script:BuildMessage = "Failure building product"
-    if ($restore -or $build -or $rebuild -or $pack -or $sign -or $publish -and -not $skipBuild -and -not $sourceBuild) {
+    if ($restore -or $build -or $rebuild -or $pack -or $sign -or $publish -and -not $skipBuild -and -not $productBuild) {
         $originalSignValue = $sign
         if ($msbuildEngine -eq "dotnet") {
             # Building FSharp.sln and VisualFSharp.sln with .NET Core MSBuild
@@ -587,7 +581,8 @@ try {
         BuildSolution "FSharp.Benchmarks.sln" $False
     }
 
-    if ($pack) {
+    # When building in product build mode, only build the compiler solution.
+    if ($pack -or $productBuild) {
         $properties_storage = $properties
         BuildSolution "Microsoft.FSharp.Compiler.sln" $True
         $properties = $properties_storage
@@ -615,7 +610,8 @@ try {
 
     if ($testDesktop -and $ci) {
         $bgJob = TestUsingMSBuild -testProject "$RepoRoot\tests\fsharp\FSharpSuite.Tests.fsproj" -targetFramework $script:desktopTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharpSuite.Tests\" -asBackgroundJob $true
-
+        
+        TestUsingMSBuild -testProject "$RepoRoot\tests\FSharp.Test.Utilities\FSharp.Test.Utilities.fsproj" -targetFramework $script:desktopTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharp.Test.Utilities\"
         TestUsingMSBuild -testProject "$RepoRoot\tests\FSharp.Compiler.ComponentTests\FSharp.Compiler.ComponentTests.fsproj" -targetFramework $script:desktopTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharp.Compiler.ComponentTests\"
         TestUsingMSBuild -testProject "$RepoRoot\tests\FSharp.Compiler.Service.Tests\FSharp.Compiler.Service.Tests.fsproj" -targetFramework $script:desktopTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharp.Compiler.Service.Tests\"
         TestUsingMSBuild -testProject "$RepoRoot\tests\FSharp.Compiler.Private.Scripting.UnitTests\FSharp.Compiler.Private.Scripting.UnitTests.fsproj" -targetFramework $script:desktopTargetFramework  -testadapterpath "$ArtifactsDir\bin\FSharp.Compiler.Private.Scripting.UnitTests\"

src/fsharp/eng/DotNetBuild.props

@@ -1,23 +1,11 @@
 <!-- When altering this file, include @dotnet/product-construction as a reviewer. -->
-
 <Project>
 
   <PropertyGroup>
     <GitHubRepositoryName>fsharp</GitHubRepositoryName>
     <SourceBuildManagedOnly>true</SourceBuildManagedOnly>
   </PropertyGroup>
 
-  <!--
-    The build script passes in the full path of the sln to build.  This must be overridden in order to build
-    the cloned source in the inner build.
-  -->
-  <Target Name="ConfigureInnerBuildArg"
-          BeforeTargets="GetSourceBuildCommandConfiguration">
-    <PropertyGroup>
-      <InnerBuildArgs>$(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\Microsoft.FSharp.Compiler.sln"</InnerBuildArgs>
-    </PropertyGroup>
-  </Target>
-
   <!--
     The build script bootstraps some tooling for the build.  Since the inner build is triggerred via msbuild,
     trigger the bootstrapping for the inner build.
@@ -26,7 +14,6 @@
           DependsOnTargets="PrepareInnerSourceBuildRepoRoot"
           BeforeTargets="RunInnerSourceBuildCommand"
           Condition="'$(DotNetBuildSourceOnly)' == 'true'">
-          
     <PropertyGroup>
       <SourceBuildBootstrapTfmArg Condition="$(SourceBuildBootstrapTfm) != ''">--tfm $(SourceBuildBootstrapTfm)</SourceBuildBootstrapTfmArg>
       <DotNetBuildUseMonoRuntime Condition="'$(DotNetBuildUseMonoRuntime)' == ''">false</DotNetBuildUseMonoRuntime>

src/fsharp/eng/build.sh

@@ -35,7 +35,8 @@ usage()
   echo "  --skipAnalyzers                Do not run analyzers during build operations"
   echo "  --skipBuild                    Do not run the build"
   echo "  --prepareMachine               Prepare machine for CI run, clean up processes after build"
-  echo "  --sourceBuild                  Simulate building for source-build"
+  echo "  --sourceBuild                  Build the repository in source-only mode."
+  echo "  --productBuild                 Build the repository in product-build mode."
   echo "  --buildnorealsig               Build product with realsig- (default use realsig+ where necessary)"
   echo "  --tfm                          Override the default target framework"
   echo ""
@@ -73,6 +74,7 @@ skip_analyzers=false
 skip_build=false
 prepare_machine=false
 source_build=false
+product_build=false
 buildnorealsig=true
 properties=""
 
@@ -161,8 +163,12 @@ while [[ $# > 0 ]]; do
     --docker)
       docker=true
       ;;
-    --sourcebuild)
+    --sourcebuild|--source-build|-sb)
       source_build=true
+      product_build=true
+      ;;
+    --productbuild|--product-build|-pb)
+      product_build=true
       ;;
     --buildnorealsig)
       buildnorealsig=true
@@ -238,6 +244,9 @@ function BuildSolution {
   fi
 
   local projects="$repo_root/FSharp.sln"
+  if [[ "$product_build" = true ]]; then
+    projects="$repo_root/Microsoft.FSharp.Compiler.sln"
+  fi
 
   echo "$projects:"
 
@@ -247,11 +256,6 @@ function BuildSolution {
   if [[ "$UNAME" == "Darwin" ]]; then
     enable_analyzers=false
   fi
-  
-  local source_build_args=""
-  if [[ "$source_build" == true ]]; then
-    source_build_args="/p:DotNetBuildRepo=true /p:DotNetBuildSourceOnly=true"
-  fi
 
   # NuGet often exceeds the limit of open files on Mac and Linux
   # https://github.com/NuGet/Home/issues/2163
@@ -285,7 +289,7 @@ function BuildSolution {
     fi
 
     BuildMessage="Error building tools"
-    local args=" publish $repo_root/proto.proj $blrestore $bltools /p:Configuration=Proto $source_build_args $properties"
+    local args=" publish $repo_root/proto.proj $blrestore $bltools /p:Configuration=Proto $properties"
     echo $args
     "$DOTNET_INSTALL_DIR/dotnet" $args  #$args || exit $?
   fi
@@ -300,6 +304,8 @@ function BuildSolution {
       /p:RepoRoot="$repo_root" \
       /p:Restore=$restore \
       /p:Build=$build \
+      /p:DotNetBuildRepo=$product_build \
+      /p:DotNetBuildSourceOnly=$source_build \
       /p:Rebuild=$rebuild \
       /p:Pack=$pack \
       /p:Publish=$publish \
@@ -309,7 +315,6 @@ function BuildSolution {
       /p:QuietRestore=$quiet_restore \
       /p:QuietRestoreBinaryLog="$binary_log" \
       /p:BuildNoRealsig=$buildnorealsig \
-      $source_build_args \
       $properties
   fi
 }
@@ -331,6 +336,7 @@ BuildSolution
 
 if [[ "$test_core_clr" == true ]]; then
   coreclrtestframework=$tfm
+  Test --testproject "$repo_root/tests/FSharp.Test.Utilities/FSharp.Test.Utilities.fsproj" --targetframework $coreclrtestframework
   Test --testproject "$repo_root/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj" --targetframework $coreclrtestframework
   Test --testproject "$repo_root/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj" --targetframework $coreclrtestframework
   Test --testproject "$repo_root/tests/FSharp.Compiler.Private.Scripting.UnitTests/FSharp.Compiler.Private.Scripting.UnitTests.fsproj" --targetframework $coreclrtestframework