Skip to content

Fix8560 #12181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 24, 2021
Merged

Fix8560 #12181

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5a490b
fsharp core location
KevinRansom Sep 23, 2021
4817bfe
FSharp core location
KevinRansom Sep 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 19 additions & 8 deletions src/fsharp/utils/CompilerLocationUtils.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,24 +353,35 @@ module internal FSharpEnvironment =
let getFSharpCoreLibraryName = "FSharp.Core"
let fsiLibraryName = "FSharp.Compiler.Interactive.Settings"

let getFSharpCompilerLocation() =
let location = Path.GetDirectoryName(typeof<TypeInThisAssembly>.Assembly.Location)
match BinFolderOfDefaultFSharpCompiler (Some location) with
let getFSharpCompilerLocationWithDefaultFromType (defaultLocation: Type) =
let location =
try
Some (Path.GetDirectoryName(defaultLocation.Assembly.Location))
with | _ ->
None
match BinFolderOfDefaultFSharpCompiler (location) with
| Some path -> path
| None ->
let path = location |> Option.defaultValue "<null>"
#if DEBUG
Debug.Print(sprintf """FSharpEnvironment.BinFolderOfDefaultFSharpCompiler (Some '%s') returned None Location
customized incorrectly: algorithm here: https://github.com/dotnet/fsharp/blob/03f3f1c35f82af26593d025dabca57a6ef3ea9a1/src/utils/CompilerLocationUtils.fs#L171"""
location)
path)
#endif
// Use the location of this dll
location
path

// Fallback to ambient FSharp.CompilerService.dll
let getFSharpCompilerLocation() = Path.Combine(getFSharpCompilerLocationWithDefaultFromType(typeof<TypeInThisAssembly>));

// Fallback to ambient FSharp.Core.dll
let getDefaultFSharpCoreLocation() = Path.Combine(getFSharpCompilerLocationWithDefaultFromType(typeof<Unit>), getFSharpCoreLibraryName + ".dll")

let getDefaultFSharpCoreLocation() = Path.Combine(getFSharpCompilerLocation(), getFSharpCoreLibraryName + ".dll")
let getDefaultFsiLibraryLocation() = Path.Combine(getFSharpCompilerLocation(), fsiLibraryName + ".dll")
// Must be alongside the location of FSharp.CompilerService.dll
let getDefaultFsiLibraryLocation() = Path.Combine(Path.GetDirectoryName(getFSharpCompilerLocation()), fsiLibraryName + ".dll")

// Path to the directory containing the fsharp compilers
let fsharpCompilerPath = Path.Combine(Path.GetDirectoryName(typeof<TypeInThisAssembly>.GetTypeInfo().Assembly.Location), "Tools")
let fsharpCompilerPath = Path.Combine(Path.GetDirectoryName(getFSharpCompilerLocation()), "Tools")

let isWindows = RuntimeInformation.IsOSPlatform(OSPlatform.Windows)

Expand Down