Fixes for FSAC (#120)

ionide · Nov 2, 2021 · d6e16bf · d6e16bf
1 parent 117232e
commit d6e16bf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/Ionide.ProjInfo.ProjectSystem/ProjectSystem.fs b/src/Ionide.ProjInfo.ProjectSystem/ProjectSystem.fs
@@ -69,7 +69,11 @@ type ProjectController(toolsPath: ToolsPath, workspaceLoaderFactory: ToolsPath -
     let updateState (response: ProjectCrackerCache) =
         let normalizeOptions (opts: FSharpProjectOptions) =
             { opts with
-                  SourceFiles = opts.SourceFiles |> Array.filter (FscArguments.isCompileFile) |> Array.map (Path.GetFullPath)
+                  SourceFiles =
+                    opts.SourceFiles
+                    |> Array.filter (FscArguments.isCompileFile)
+                    |> Array.map (Path.GetFullPath)
+                    |> Array.map (fun p -> (p.Chars 0).ToString().ToLower() + p.Substring(1))
                   OtherOptions =
                       opts.OtherOptions
                       |> Array.map

diff --git a/src/Ionide.ProjInfo/Library.fs b/src/Ionide.ProjInfo/Library.fs
@@ -126,7 +126,7 @@ module Init =
     let private resolveFromSdkRoot (sdkRoot: DirectoryInfo) : Func<AssemblyLoadContext, System.Reflection.AssemblyName, System.Reflection.Assembly> =
         Func<AssemblyLoadContext, System.Reflection.AssemblyName, System.Reflection.Assembly>
             (fun assemblyLoadContext assemblyName ->
-                let paths = [ Path.Combine(sdkRoot.FullName, assemblyName.Name + ".dll") ]
+                let paths = [ Path.Combine(sdkRoot.FullName, assemblyName.Name + ".dll"); Path.Combine(sdkRoot.FullName, "en", assemblyName.Name + ".dll") ]
 
                 match paths |> List.tryFind File.Exists with
                 | Some path -> assemblyLoadContext.LoadFromAssemblyPath path