Using simple dictionary for msbuild props

Author: TheAngryByrd

src/FsAutoComplete/LspHelpers.fs

@@ -610,7 +610,7 @@ type NotificationsDto =
     TraceNamespaces: string array option }
 
 type BuildOptionsDto =
-  { MsBuildProperties: string array option }
+  { MsBuildProperties: Dictionary<string, string> option }
 
 type DebugDto =
   { DontCheckRelatedFiles: bool option
@@ -729,17 +729,22 @@ type FSACConfig =
 
   member this.AddDto(dto: FSACDto) =
     { CachedTypeCheckCount = defaultArg dto.CachedTypeCheckCount this.CachedTypeCheckCount }
+
 type BuildOptions =
-  { MsBuildProperties: string array }
+  { MsBuildProperties: Map<string, string> }
 
-  static member Default = { MsBuildProperties = [||] }
+  static member Default = { MsBuildProperties = Map.empty }
 
   static member FromDto(dto: BuildOptionsDto) : BuildOptions =
-    { MsBuildProperties = defaultArg dto.MsBuildProperties BuildOptions.Default.MsBuildProperties }
+    let props = dto.MsBuildProperties |> Option.map (Seq.map (|KeyValue|) >> Map.ofSeq)
+
+    { MsBuildProperties = defaultArg props BuildOptions.Default.MsBuildProperties }
 
 
   member this.AddDto(dto: BuildOptionsDto) : BuildOptions =
-    { MsBuildProperties = defaultArg dto.MsBuildProperties this.MsBuildProperties }
+    let props = dto.MsBuildProperties |> Option.map (Seq.map (|KeyValue|) >> Map.ofSeq)
+
+    { MsBuildProperties = defaultArg props this.MsBuildProperties }
 
 type DebugConfig =
   { DontCheckRelatedFiles: bool

src/FsAutoComplete/LspServers/AdaptiveFSharpLspServer.fs

@@ -509,22 +509,15 @@ type AdaptiveFSharpLspServer(workspaceLoader: Map<string, string> -> IWorkspaceL
 
     file |> addAValLogging logMsg
 
-  let loaderFactory = cval<Map<string, string> -> Ionide.ProjInfo.IWorkspaceLoader> workspaceLoader
+  let loaderFactory =
+    cval<Map<string, string> -> Ionide.ProjInfo.IWorkspaceLoader> workspaceLoader
+
   let loader =
     aval {
       let! loaderFactory = loaderFactory
       and! config = config
 
-      let props =
-        config.BuildOptions.MsBuildProperties
-        |> Array.choose(fun s ->
-          match s.Split("=") |> Array.toList with
-          | head::shoulders::_ -> Some(head,shoulders)
-          | _ -> None
-        )
-        |> Map.ofArray
-
-      return loaderFactory props
+      return loaderFactory config.BuildOptions.MsBuildProperties
     }
 
 

src/FsAutoComplete/LspServers/FsAutoComplete.Lsp.fs

@@ -2953,7 +2953,9 @@ module FSharpLspServer =
       |> Map.add "fsproj/removeFile" (serverRequestHandling (fun s p -> s.FsProjRemoveFile(p)))
 
     let regularServer lspClient =
-      let state = State.Initial toolsPath stateStorageDir (fun toolsPath -> workspaceLoaderFactory toolsPath Map.empty)
+      let state =
+        State.Initial toolsPath stateStorageDir (fun toolsPath -> workspaceLoaderFactory toolsPath Map.empty)
+
       let originalFs = FSharp.Compiler.IO.FileSystemAutoOpens.FileSystem
       FSharp.Compiler.IO.FileSystemAutoOpens.FileSystem <- FsAutoComplete.FileSystem(originalFs, state.Files.TryFind)
       new FSharpLspServer(state, lspClient) :> IFSharpLspServer

src/FsAutoComplete/Parser.fs

@@ -132,6 +132,7 @@ module Parser =
         let workspaceLoaderFactory =
           fun toolsPath props ->
             let props = Map.merge ProjectLoader.globalProperties props |> Map.toList
+
             if projectGraphEnabled then
               Ionide.ProjInfo.WorkspaceLoaderViaProjectGraph.Create(toolsPath, props)
             else
@@ -192,6 +193,7 @@ module Parser =
       if ctx.ParseResult.GetValueForOption otelTracingOption then
         let serviceName = FsAutoComplete.Utils.Tracing.serviceName
         let version = FsAutoComplete.Utils.Version.info().Version
+
         tracerProvider <-
           Sdk
             .CreateTracerProviderBuilder()