Commit0ec9eca

committed

Fix 2823 - don't look in mono/4.5-api for F# interactive code

1 parent221dd7e commit0ec9ecaCopy full SHA for 0ec9eca

File tree

+16

-10

lines changed

+16

-10

lines changed

Lines changed: 16 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -2816,16 +2816,22 @@ type TcConfig private (data : TcConfigBuilder,validate:bool) =`
`2816`	`2816`	`if runningOnMonothen`
`2817`	`2817`	`[letruntimeRoot= System.Runtime.InteropServices.RuntimeEnvironment.GetRuntimeDirectory()`
`2818`	`2818`	`letruntimeRootWithoutSlash= runtimeRoot.TrimEnd('/','\\')`
`2819`		`-letapi= runtimeRootWithoutSlash+"-api"`
`2820`		`-yield runtimeRoot// The default FSharp.Core is found in lib/mono/4.5`
`2821`		`-if Directory.Exists(api)then`
`2822`		`-yield api`
`2823`		`-letfacades= Path.Combine(api,"Facades")`
`2824`		`-if Directory.Exists(facades)then`
`2825`		`-yield facades`
`2826`		`-letfacades= Path.Combine(runtimeRoot,"Facades")`
`2827`		`-if Directory.Exists(facades)then`
`2828`		`-yield facades`
	`2819`	`+match tcConfig.resolutionEnvironmentwith`
	`2820`	`+#if!FSI_TODO_NETCORE`
	`2821`	`+\| ReferenceResolver.RuntimeLike->`
	`2822`	`+yield runtimeRoot`
	`2823`	`+#endif`
	`2824`	`+\|_->`
	`2825`	`+letapi= runtimeRootWithoutSlash+"-api"`
	`2826`	`+yield runtimeRoot// The default FSharp.Core is found in lib/mono/4.5`
	`2827`	`+if Directory.Exists(api)then`
	`2828`	`+yield api`
	`2829`	`+letfacades= Path.Combine(api,"Facades")`
	`2830`	`+if Directory.Exists(facades)then`
	`2831`	`+yield facades`
	`2832`	`+letfacades= Path.Combine(runtimeRoot,"Facades")`
	`2833`	`+if Directory.Exists(facades)then`
	`2834`	`+yield facades`
`2829`	`2835`	`]`
`2830`	`2836`	`else`
`2831`	`2837`	`#endif`

Comments

(0)