set gc server for x86 too

Author: majocha

eng/update-testhost-gcserver.fsx

@@ -1,9 +1,11 @@
-// Windows-only: Enables gcServer in the local .dotnet SDK testhost app.config and prints the SDK version.
+// 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 .dotnet\sdk\{version}\TestHostNetFramework\testhost.net472.exe.config and ensures
-//    <runtime><gcServer enabled="true"/></runtime> is present, then saves the file.
+// 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.
 // Usage (from repo root): dotnet fsi eng/update-testhost-gcserver.fsx
 
 open System
@@ -68,45 +70,56 @@ match findDotnetRoot startDir with
             // Print the SDK version
             printfn "%s" version
 
-            // Locate the specified config file and ensure gcServer is enabled
-            let cfgPath =
-                Path.Combine(dotnetRoot, "sdk", version, "TestHostNetFramework", "testhost.net472.exe.config")
+            // Locate both config files and ensure gcServer is enabled
+            let cfgFileNames =
+                [| "testhost.net472.x86.exe.config"; "testhost.net472.exe.config" |]
 
-            if not (File.Exists cfgPath) then
-                eprintfn "Error: Config file not found: %s" cfgPath
-                exit 2
-
-            // Update the XML config: ensure <runtime><gcServer enabled="true"/></runtime>
-            let doc = System.Xml.Linq.XDocument.Load(cfgPath)
             let xn name = System.Xml.Linq.XName.Get(name)
 
-            let configuration =
-                match doc.Element(xn "configuration") with
-                | null ->
-                    let root = System.Xml.Linq.XElement(xn "configuration")
-                    doc.Add(root)
-                    root
-                | r -> r
-
-            let runtime =
-                match configuration.Element(xn "runtime") with
-                | null ->
-                    let r = System.Xml.Linq.XElement(xn "runtime")
-                    configuration.Add(r)
-                    r
-                | r -> r
-
-            let gcServerEl =
-                match runtime.Element(xn "gcServer") with
-                | null ->
-                    let el = System.Xml.Linq.XElement(xn "gcServer")
-                    el.SetAttributeValue(xn "enabled", "true")
-                    runtime.Add(el)
-                    el
-                | el ->
-                    el.SetAttributeValue(xn "enabled", "true")
-                    el
-
-            doc.Save(cfgPath)
-            printfn "Updated: %s (gcServer enabled=true)" cfgPath
-            exit 0
+            let updateOne (path: string) =
+                if not (File.Exists path) then
+                    false
+                else
+                    let doc = System.Xml.Linq.XDocument.Load(path)
+
+                    let configuration =
+                        match doc.Element(xn "configuration") with
+                        | null ->
+                            let root = System.Xml.Linq.XElement(xn "configuration")
+                            doc.Add(root)
+                            root
+                        | r -> r
+
+                    let runtime =
+                        match configuration.Element(xn "runtime") with
+                        | null ->
+                            let r = System.Xml.Linq.XElement(xn "runtime")
+                            configuration.Add(r)
+                            r
+                        | r -> r
+
+                    match runtime.Element(xn "gcServer") with
+                    | null ->
+                        let el = System.Xml.Linq.XElement(xn "gcServer")
+                        el.SetAttributeValue(xn "enabled", "true")
+                        runtime.Add(el)
+                    | el ->
+                        el.SetAttributeValue(xn "enabled", "true")
+
+                    doc.Save(path)
+                    printfn "Updated: %s (gcServer enabled=true)" path
+                    true
+
+            let cfgPaths =
+                cfgFileNames
+                |> Array.map (fun f -> Path.Combine(dotnetRoot, "sdk", version, "TestHostNetFramework", f))
+
+            let results = cfgPaths |> Array.map updateOne
+            let updatedCount = results |> Array.filter id |> Array.length
+
+            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))
+                exit 2
+            else
+                exit 0