Skip to content

Commit ff4e215

Browse files
committed
Merge branch 'pdb-method-cdi-emission' into hotreload-baseline-reader
2 parents 9188b15 + f17117d commit ff4e215

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,10 +324,15 @@ let private buildCSharpScratchPdb () =
324324
)
325325

326326
let psi = System.Diagnostics.ProcessStartInfo()
327-
psi.FileName <- Path.Combine(__SOURCE_DIRECTORY__, "..", "..", "..", ".dotnet", "dotnet")
327+
// Resolve the dotnet host like the rest of the test framework: repo-local .dotnet
328+
// first, PATH fallback otherwise (the hand-rolled path misses on some CI images).
329+
psi.FileName <- TestFramework.initialConfig.DotNetExe
328330
// ProcessStartInfo.ArgumentList does not exist on net472, so build the quoted argument
329331
// string by hand (projPath is the only argument that can contain spaces).
330332
psi.Arguments <- $"build \"{projPath}\" -c Debug -p:DebugType=portable -v m"
333+
// net472 defaults UseShellExecute to true, which is incompatible with stream
334+
// redirection; set it explicitly so the Desktop test legs can start the process.
335+
psi.UseShellExecute <- false
331336
psi.RedirectStandardOutput <- true
332337
psi.RedirectStandardError <- true
333338
psi.WorkingDirectory <- workDir

0 commit comments

Comments
 (0)