Commitc9eb89c

authored

For FSI on coreclr use ResolutionEnvironment.CompilationAndEvaluation just like on desktop (#3963)

1 parenta9d822a commitc9eb89cCopy full SHA for c9eb89c

File tree

-9

lines changed

-9

lines changed

Lines changed: 1 addition & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -5071,13 +5071,7 @@ module private ScriptPreprocessClosure =`
`5071`	`5071`	`match codeContextwith`
`5072`	`5072`	`\| CodeContext.Editing-> ResolutionEnvironment.EditingOrCompilationtrue`
`5073`	`5073`	`\| CodeContext.Compilation-> ResolutionEnvironment.EditingOrCompilationfalse`
`5074`		`-\| CodeContext.CompilationAndEvaluation->`
`5075`		`-#if FSI_TODO_NETCORE`
`5076`		`-// "CompilationAndEvaluation" assembly resolution for F# Interactive is not yet properly figured out on .NET Core`
`5077`		`- ResolutionEnvironment.EditingOrCompilationfalse`
`5078`		`-#else`
`5079`		`- ResolutionEnvironment.CompilationAndEvaluation`
`5080`		`-#endif`
	`5074`	`+\| CodeContext.CompilationAndEvaluation-> ResolutionEnvironment.CompilationAndEvaluation`
`5081`	`5075`	`tcConfigB.framework<-false`
`5082`	`5076`	`tcConfigB.useSimpleResolution<- useSimpleResolution`
`5083`	`5077`	`// Indicates that there are some references not in BasicReferencesForScriptLoadClosure which should`

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2464,8 +2464,6 @@ type FsiEvaluationSession (fsi: FsiEvaluationSessionHostConfig, argv:string[], i`
`2464`	`2464`	`do tcConfigB.useFsiAuxLib<- fsi.UseFsiAuxLib`
`2465`	`2465`
`2466`	`2466`	`#if FSI_TODO_NETCORE`
`2467`		`-// "CompilationAndEvaluation" assembly resolution for F# Interactive is not yet properly figured out on .NET Core`
`2468`		`-do tcConfigB.resolutionEnvironment<- ResolutionEnvironment.EditingOrCompilationfalse`
`2469`	`2467`	`do tcConfigB.useSimpleResolution<-true`
`2470`	`2468`	`do SetTargetProfile tcConfigB"netcore"// always assume System.Runtime codegen`
`2471`	`2469`	`#endif`

Comments

(0)