Merge branch 'hotreload-baseline-reader' into hotreload-delta-emitter

Author: NatElkins

tests/FSharp.Compiler.ComponentTests/CompilerService/EncMethodDebugInformationTests.fs

@@ -204,7 +204,7 @@ let ``Synthesized name snapshot preserves mixed bucket allocation order`` () =
     let decoded = deserializeSynthesizedNameSnapshot blob
 
     match Map.tryFind "endpoints" decoded with
-    | Some actualNames -> Assert.Equal<string>(expectedNames, actualNames)
+    | Some actualNames -> Assert.Equal<string[]>(expectedNames, actualNames)
     | None -> failwith "expected endpoints bucket to round-trip"
 
 // -----------------------------------------------------------------------
@@ -324,10 +324,15 @@ let private buildCSharpScratchPdb () =
     )
 
     let psi = System.Diagnostics.ProcessStartInfo()
-    psi.FileName <- Path.Combine(__SOURCE_DIRECTORY__, "..", "..", "..", ".dotnet", "dotnet")
+    // Resolve the dotnet host like the rest of the test framework: repo-local .dotnet
+    // first, PATH fallback otherwise (the hand-rolled path misses on some CI images).
+    psi.FileName <- TestFramework.initialConfig.DotNetExe
     // ProcessStartInfo.ArgumentList does not exist on net472, so build the quoted argument
     // string by hand (projPath is the only argument that can contain spaces).
     psi.Arguments <- $"build \"{projPath}\" -c Debug -p:DebugType=portable -v m"
+    // net472 defaults UseShellExecute to true, which is incompatible with stream
+    // redirection; set it explicitly so the Desktop test legs can start the process.
+    psi.UseShellExecute <- false
     psi.RedirectStandardOutput <- true
     psi.RedirectStandardError <- true
     psi.WorkingDirectory <- workDir
@@ -680,7 +685,7 @@ let ``Synthetic module CustomDebugInformation row round-trips synthesized snapsh
         match Map.tryFind "endpoints" snapshot with
         | Some names ->
             let struct (_, expectedNames) = List.head expected
-            Assert.Equal<string>(expectedNames, names)
+            Assert.Equal<string[]>(expectedNames, names)
         | None -> failwith "expected endpoints bucket"
     | None -> failwith "expected recorded synthesized-name snapshot"
 
@@ -735,7 +740,7 @@ let ``Baseline reader gives recorded synthesized snapshot precedence over recons
     Assert.Equal(SynthesizedNameSnapshotSource.Recorded, baseline.SynthesizedNameSnapshotSource)
 
     match Map.tryFind "endpoints" baseline.SynthesizedNameSnapshot with
-    | Some names -> Assert.Equal<string>(recordedNames, names)
+    | Some names -> Assert.Equal<string[]>(recordedNames, names)
     | None -> failwith "expected recorded endpoints bucket"
 
 [<Fact>]