fix search

Author: dsyme

src/fsharp/ReferenceResolver.fs

@@ -118,11 +118,13 @@ let SimplisticResolver =
                 if System.Environment.OSVersion.Platform = System.PlatformID.Win32NT then 
                     yield! registrySearchPaths() ]
 
-            for (baggage,r) in references do
+            for (r, baggage) in references do
               try
+                printfn "resolving %s" r
                 let mutable found = false
                 let success path = 
                     if not found then 
+                        printfn "resolved %s --> %s" r path
                         found <- true
                         results.Add { itemSpec = path; prepareToolTip = snd; baggage=baggage } 
 
@@ -140,7 +142,6 @@ let SimplisticResolver =
                             | s -> s 
                         PF + @"\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\"  + n.Version.ToString()
                     let trialPath = Path.Combine(fscoreDir0,n.Name + ".dll")
-                    printfn "searching %s" trialPath
                     if FileSystem.SafeExists(trialPath) then 
                         success trialPath
 
@@ -163,11 +164,11 @@ let SimplisticResolver =
                         if FileSystem.SafeExists(trialPath) then 
                             success trialPath
 
-                if not found then 
-                    let ass = try Some (Assembly.Load(r)) with _ -> None
-                    match ass with 
-                    | Some ass -> success ass.Location 
-                    | None -> ()
+                //if not found then 
+                //    let ass = try Some (Assembly.Load(r)) with _ -> None
+                //    match ass with 
+                //    | Some ass -> success ass.Location 
+                //    | None -> ()
               with e -> logWarning "SR001" (e.ToString())
             results.ToArray() }
 
@@ -186,15 +187,15 @@ let fscoreDir =
         System.Runtime.InteropServices.RuntimeEnvironment.GetRuntimeDirectory()
 
 let resolve s = 
-    SimplisticResolver.Resolve(ResolutionEnvironment.CompileTimeLike,[| for a in s -> ("", a) |],"v4.5.1", [SimplisticResolver.DotNetFrameworkReferenceAssembliesRootDirectory + @"\v4.5.1" ],"", "", fscoreDir,[],__SOURCE_DIRECTORY__,ignore, (fun _ _ -> ()), (fun _ _-> ()))
+    SimplisticResolver.Resolve(ResolutionEnvironment.CompileTimeLike,[| for a in s -> (a, "") |],"v4.5.1", [SimplisticResolver.DotNetFrameworkReferenceAssembliesRootDirectory + @"\v4.5.1" ],"", "", fscoreDir,[],__SOURCE_DIRECTORY__,ignore, (fun _ _ -> ()), (fun _ _-> ()))
 
 resolve ["System"; "mscorlib"; "mscorlib.dll"; "FSharp.Core"; "FSharp.Core.dll"; "Microsoft.SqlServer.Dmf.dll"; "Microsoft.SqlServer.Dmf"  ]
 
 resolve [ "FSharp.Core, Version=4.4.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" ]
 #endif
 
 let GetDefaultResolver(msbuildEnabled: bool, msbuildVersion: string option) = 
-    //let msbuildEnabled = msbuildEnabled && false
+    let msbuildEnabled = msbuildEnabled && false
     let tryMSBuild v = 
       if msbuildEnabled then 
         // Detect if MSBuild v12 is on the machine, if so use the resolver from there

tests/service/FSharp.Compiler.Service.Tests.fsproj

@@ -99,11 +99,6 @@
       <Project>{887630a3-4b1d-40ea-b8b3-2d842e9c40db}</Project>
       <Private>True</Private>
     </ProjectReference>
-    <ProjectReference Include="data\TestTP\TestTP.fsproj">
-      <Name>TestTP</Name>
-      <Project>{ff76bd3c-5e0a-4752-b6c3-044f6e15719b}</Project>
-      <Private>True</Private>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <ItemGroup>

tests/service/ProjectAnalysisTests.fs

@@ -4510,15 +4510,6 @@ module Project35b =
     let options = checker.GetProjectOptionsFromScript(fileName1, fileSource1) |> Async.RunSynchronously
 #endif
 
-[<Test>]
-let ``Test project35b Dependency files for ParseFileInProject`` () =
-    // This is testing legacy functionality
-    let parseFileResults = checker.ParseFileInProject(Project35b.fileName1, Project35b.fileSource1, Project35b.options) |> Async.RunSynchronously
-    for d in parseFileResults.DependencyFiles do 
-        printfn "ParseFileInProject dependency: %s" d
-    parseFileResults.DependencyFiles |> List.exists (fun s -> s.Contains "notexist.dll") |> shouldEqual true
-    parseFileResults.DependencyFiles |> List.exists (fun s -> s.Contains Project35b.fileName1) |> shouldEqual true
-
 [<Test>]
 let ``Test project35b Dependency files for ParseAndCheckFileInProject`` () =
     let checkFileResults =