add servergc switch

Author: majocha

azure-pipelines-PR.yml

@@ -319,7 +319,7 @@ stages:
           - checkout: self
             clean: true
 
-          - script: eng\CIBuildNoPublish.cmd -compressallmetadata -buildnorealsig -testDesktop -configuration Release -testBatch $(System.JobPositionInPhase)
+          - script: eng\CIBuildNoPublish.cmd -compressallmetadata -buildnorealsig -testDesktop -servergc -configuration Release -testBatch $(System.JobPositionInPhase)
             env:
               FSharp_CacheEvictionImmediate: true
               DOTNET_DbgEnableMiniDump: 1
@@ -560,7 +560,7 @@ stages:
           - checkout: self
             clean: true
 
-          - script: eng\CIBuildNoPublish.cmd -compressallmetadata -configuration Release -testDesktop -testBatch $(System.JobPositionInPhase)
+          - script: eng\CIBuildNoPublish.cmd -compressallmetadata -configuration Release -testDesktop -servergc -testBatch $(System.JobPositionInPhase)
             env:
               FSharp_CacheEvictionImmediate: true
               DOTNET_DbgEnableMiniDump: 1

eng/Build.ps1

@@ -74,6 +74,7 @@ param (
     [switch]$compressAllMetadata,
     [switch]$buildnorealsig = $true,
     [switch]$verifypackageshipstatus = $false,
+    [switch]$servergc,
     [string]$testBatch = "",
     [parameter(ValueFromRemainingArguments = $true)][string[]]$properties)
 
@@ -141,6 +142,7 @@ function Print-Usage() {
     Write-Host "  -compressAllMetadata          Build product with compressed metadata"
     Write-Host "  -buildnorealsig               Build product with realsig- (default use realsig+, where necessary)"
     Write-Host "  -verifypackageshipstatus      Verify whether the packages we are building have already shipped to nuget"
+    Write-Host "  -servergc                     Enable Server GC in .NET Framework testhosts"
     Write-Host ""
     Write-Host "Command line arguments starting with '/p:' are passed through to MSBuild."
 }
@@ -602,22 +604,23 @@ try {
     $script:BuildMessage = "Failure running tests"
 
 
+    # Run Server GC config update once before any desktop-targeted tests
+    if ($servergc -and ( $testDesktop -or ($testVs -and -not $noVisualStudio) )) {
+        Write-Host "Ensuring Server GC in .NET Framework testhosts (updating net472 and net472.x86 configs from local .dotnet SDK) ..."
+        dotnet fsi "$PSScriptRoot\update-testhost-gcserver.fsx"
+    }
+
+
     if ($testCoreClr) {
         TestUsingMSBuild -testProject "$RepoRoot\FSharp.sln" -targetFramework $script:coreclrTargetFramework
     }
 
 
     if ($testDesktop) {
-        # Ensure gcServer is enabled in testhost config before desktop tests
-        Write-Host "Updating testhost config for desktopTargetFramework..."
-        dotnet fsi "$PSScriptRoot\update-testhost-gcserver.fsx"
         TestUsingMSBuild -testProject "$RepoRoot\FSharp.sln" -targetFramework $script:desktopTargetFramework
     }
 
     if ($testVs -and -not $noVisualStudio) {
-        # Ensure gcServer is enabled in testhost config before VS editor desktop tests
-        Write-Host "Updating testhost config for desktopTargetFramework (testVs)..."
-        dotnet fsi "$PSScriptRoot\update-testhost-gcserver.fsx"
         TestUsingMSBuild -testProject "$RepoRoot\vsintegration\tests\UnitTests\VisualFSharp.UnitTests.fsproj" -targetFramework $script:desktopTargetFramework
     }
 

eng/update-testhost-gcserver.fsx

@@ -1,11 +1,7 @@
-// Windows-only: Enables gcServer in the local .dotnet SDK testhost app.config files and prints the SDK version.
-// What it does:
-// 1) Finds the repo-local .dotnet folder by walking up from this script's directory.
-// 2) Runs .dotnet\dotnet.exe --version to get the SDK version and prints it.
-// 3) Locates both
-//    - .dotnet\sdk\{version}\TestHostNetFramework\testhost.net472.exe.config and
-//    - .dotnet\sdk\{version}\TestHostNetFramework\testhost.net472.x86.exe.config
-//    and ensures <runtime><gcServer enabled="true"/></runtime> is present, then saves the files.
+// Windows-only utility for F# build: ensures <gcServer enabled="true"/> in .NET Framework testhost configs.
+// - Prints local .dotnet SDK version
+// - Updates BOTH AnyCPU and x86 testhost.net472*.exe.config files under the local .dotnet SDK
+// - Intended to run ONCE before desktop/VS tests (not per test)
 // Usage (from repo root): dotnet fsi eng/update-testhost-gcserver.fsx
 
 open System
@@ -14,7 +10,7 @@ open System.IO
 
 // This script is intended for Windows only
 if not (OperatingSystem.IsWindows()) then
-    eprintfn "Error: This script supports Windows only."
+    eprintfn "[ServerGC] ERROR: This script supports Windows only."
     exit 1
 
 let exeName = "dotnet.exe"
@@ -32,7 +28,7 @@ let startDir = DirectoryInfo(__SOURCE_DIRECTORY__)
 
 match findDotnetRoot startDir with
 | None ->
-    eprintfn "Error: .dotnet folder with %s not found starting from %s" exeName startDir.FullName
+    eprintfn "[ServerGC] ERROR: .dotnet folder with %s not found starting from %s" exeName startDir.FullName
     exit 1
 | Some dotnetRoot ->
     let dotnetPath = Path.Combine(dotnetRoot, exeName)
@@ -49,26 +45,26 @@ match findDotnetRoot startDir with
     use proc = new Process()
     proc.StartInfo <- psi
     if not (proc.Start()) then
-        eprintfn "Error: Failed to start %s" dotnetPath
+        eprintfn "[ServerGC] ERROR: Failed to start %s" dotnetPath
         exit 1
 
     let stdOut = proc.StandardOutput.ReadToEnd()
     let stdErr = proc.StandardError.ReadToEnd()
     proc.WaitForExit()
 
     if proc.ExitCode <> 0 then
-        eprintfn "Error: %s --version failed with exit code %d" dotnetPath proc.ExitCode
+        eprintfn "[ServerGC] ERROR: %s --version failed with exit code %d" dotnetPath proc.ExitCode
         if not (System.String.IsNullOrWhiteSpace stdErr) then eprintf "%s" stdErr
         exit proc.ExitCode
     else
         let version = stdOut.Trim()
         if System.String.IsNullOrWhiteSpace version then
-            eprintfn "Error: No version output from %s --version" dotnetPath
+            eprintfn "[ServerGC] ERROR: No version output from %s --version" dotnetPath
             if not (System.String.IsNullOrWhiteSpace stdErr) then eprintf "%s" stdErr
             exit 1
         else
             // Print the SDK version
-            printfn "%s" version
+            printfn "[ServerGC] Local .dotnet SDK version: %s" version
 
             // Locate both config files and ensure gcServer is enabled
             let cfgFileNames =
@@ -107,7 +103,7 @@ match findDotnetRoot startDir with
                         el.SetAttributeValue(xn "enabled", "true")
 
                     doc.Save(path)
-                    printfn "Updated: %s (gcServer enabled=true)" path
+                    printfn "[ServerGC] Updated: %s (gcServer enabled=true)" path
                     true
 
             let cfgPaths =
@@ -119,7 +115,10 @@ match findDotnetRoot startDir with
 
             if updatedCount = 0 then
                 // Fail only if none of the expected files were found
-                eprintfn "Error: None of the expected config files were found:\n%s" (String.Join("\n", cfgPaths))
+                eprintfn "[ServerGC] ERROR: None of the expected config files were found:\n%s" (String.Join("\n", cfgPaths))
                 exit 2
             else
+                printfn "[ServerGC] Updated %d config file(s):" updatedCount
+                for i = 0 to cfgPaths.Length - 1 do
+                    if results.[i] then printfn "[ServerGC]   %s" cfgPaths.[i]
                 exit 0