Skip to content

Commit 0aa3186

Browse files
KevinRansombaronfel
authored andcommitted
Eager Packages (#9652)
* Couple of test cases * Eager packages * Update fsi.fs comment
1 parent 17cff6c commit 0aa3186

2 files changed

Lines changed: 13 additions & 3 deletions

File tree

src/fsharp/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.Utilities.fs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,10 +209,10 @@ module internal Utilities =
209209
let succeeded, stdOut, stdErr =
210210
if not (isRunningOnCoreClr) then
211211
// The Desktop build uses "msbuild" to build
212-
executeBuild msbuildExePath (arguments "") workingDir
212+
executeBuild msbuildExePath (arguments "-v:quiet") workingDir
213213
else
214214
// The coreclr uses "dotnet msbuild" to build
215-
executeBuild dotnetHostPath (arguments "msbuild") workingDir
215+
executeBuild dotnetHostPath (arguments "msbuild -v:quiet") workingDir
216216

217217
let outputFile = projectPath + ".resolvedReferences.paths"
218218
let resultOutFile = if succeeded && File.Exists(outputFile) then Some outputFile else None

src/fsharp/fsi/fsi.fs

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2290,6 +2290,16 @@ type internal FsiInteractionProcessor
22902290
| EndOfFile -> istate,defaultArg lastResult (Completed None) (* drop nextAction on EOF *)
22912291
| CtrlC -> istate,CtrlC (* drop nextAction on CtrlC *)
22922292

2293+
/// Execute a single parsed interaction which may contain multiple items to be executed
2294+
/// independently
2295+
let executeParsedInteractions (ctok, tcConfig, istate, action, errorLogger: ErrorLogger, lastResult:option<FsiInteractionStepStatus>, cancellationToken: CancellationToken) =
2296+
let istate, completed = execParsedInteractions (ctok, tcConfig, istate, action, errorLogger, lastResult, cancellationToken)
2297+
match completed with
2298+
| Completed _ ->
2299+
let istate = fsiDynamicCompiler.CommitDependencyManagerText(ctok, istate, lexResourceManager, errorLogger)
2300+
istate, completed
2301+
| _ -> istate, completed
2302+
22932303
/// Execute a single parsed interaction on the parser/execute thread.
22942304
let mainThreadProcessAction ctok action istate =
22952305
try
@@ -2314,7 +2324,7 @@ type internal FsiInteractionProcessor
23142324

23152325
let mainThreadProcessParsedInteractions ctok errorLogger (action, istate) cancellationToken =
23162326
istate |> mainThreadProcessAction ctok (fun ctok tcConfig istate ->
2317-
execParsedInteractions (ctok, tcConfig, istate, action, errorLogger, None, cancellationToken))
2327+
executeParsedInteractions (ctok, tcConfig, istate, action, errorLogger, None, cancellationToken))
23182328

23192329
let parseExpression (tokenizer:LexFilter.LexFilter) =
23202330
reusingLexbufForParsing tokenizer.LexBuffer (fun () ->

0 commit comments

Comments
 (0)