From 3960cc619f8ec13f2a2c550e0b30bc07f46b6f05 Mon Sep 17 00:00:00 2001 From: Krzysztof Cieslak Date: Fri, 29 Oct 2021 18:35:35 +0200 Subject: [PATCH 1/2] Add source for MsBuild's .resource dlls --- src/Ionide.ProjInfo/Library.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Ionide.ProjInfo/Library.fs b/src/Ionide.ProjInfo/Library.fs index cddc07cc..97d9df96 100644 --- a/src/Ionide.ProjInfo/Library.fs +++ b/src/Ionide.ProjInfo/Library.fs @@ -126,7 +126,7 @@ module Init = let private resolveFromSdkRoot (sdkRoot: DirectoryInfo) : Func = Func (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 From 5748ea4bb6a96ca0b3a36dd95f6e22c3be12c709 Mon Sep 17 00:00:00 2001 From: Krzysztof Cieslak Date: Fri, 29 Oct 2021 19:12:10 +0200 Subject: [PATCH 2/2] Normalize source files in FSharpProjectOptions --- src/Ionide.ProjInfo.ProjectSystem/ProjectSystem.fs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Ionide.ProjInfo.ProjectSystem/ProjectSystem.fs b/src/Ionide.ProjInfo.ProjectSystem/ProjectSystem.fs index 847691d7..d30382cc 100644 --- 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