Skip to content

Commit d6e16bf

Browse files
Fixes for FSAC (#120)
1 parent 117232e commit d6e16bf

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

src/Ionide.ProjInfo.ProjectSystem/ProjectSystem.fs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,11 @@ type ProjectController(toolsPath: ToolsPath, workspaceLoaderFactory: ToolsPath -
6969
let updateState (response: ProjectCrackerCache) =
7070
let normalizeOptions (opts: FSharpProjectOptions) =
7171
{ opts with
72-
SourceFiles = opts.SourceFiles |> Array.filter (FscArguments.isCompileFile) |> Array.map (Path.GetFullPath)
72+
SourceFiles =
73+
opts.SourceFiles
74+
|> Array.filter (FscArguments.isCompileFile)
75+
|> Array.map (Path.GetFullPath)
76+
|> Array.map (fun p -> (p.Chars 0).ToString().ToLower() + p.Substring(1))
7377
OtherOptions =
7478
opts.OtherOptions
7579
|> Array.map

src/Ionide.ProjInfo/Library.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ module Init =
126126
let private resolveFromSdkRoot (sdkRoot: DirectoryInfo) : Func<AssemblyLoadContext, System.Reflection.AssemblyName, System.Reflection.Assembly> =
127127
Func<AssemblyLoadContext, System.Reflection.AssemblyName, System.Reflection.Assembly>
128128
(fun assemblyLoadContext assemblyName ->
129-
let paths = [ Path.Combine(sdkRoot.FullName, assemblyName.Name + ".dll") ]
129+
let paths = [ Path.Combine(sdkRoot.FullName, assemblyName.Name + ".dll"); Path.Combine(sdkRoot.FullName, "en", assemblyName.Name + ".dll") ]
130130

131131
match paths |> List.tryFind File.Exists with
132132
| Some path -> assemblyLoadContext.LoadFromAssemblyPath path

0 commit comments

Comments
 (0)