adjust namespaces and add reference for unittests

Author: dsyme

src/fsharp/FSharp.Compiler.Service.ProjectCracker.Exe/Program.fs

@@ -1,4 +1,4 @@
-namespace FSharp.Compiler.Service.ProjectCracker.Exe
+namespace Microsoft.FSharp.Compiler.SourceCodeServices.ProjectCracker.Exe
 
 open Microsoft.Build.Framework
 open Microsoft.Build.Utilities

src/fsharp/FSharp.Compiler.Service.ProjectCracker/ProjectCracker.fs

@@ -1,13 +1,11 @@
-namespace FSharp.Compiler.Service
+namespace Microsoft.FSharp.Compiler.SourceCodeServices
 
 open System.Diagnostics
 open System.Text
 open System.IO
 open System
 open System.Runtime
 
-open Microsoft.FSharp.Compiler.SourceCodeServices
-
 type ProjectCracker =
 
     static member GetProjectOptionsFromProjectFileLogged(projectFileName : string, ?properties : (string * string) list, ?loadedTimeStamp, ?enableLogging) =
@@ -16,7 +14,7 @@ type ProjectCracker =
         let enableLogging = defaultArg enableLogging true
         let logMap = ref Map.empty
 
-        let rec convert (opts: FSharp.Compiler.Service.ProjectCracker.Exe.ProjectOptions) : FSharpProjectOptions =
+        let rec convert (opts: Microsoft.FSharp.Compiler.SourceCodeServices.ProjectCracker.Exe.ProjectOptions) : FSharpProjectOptions =
             let referencedProjects = Array.map (fun (a, b) -> a, convert b) opts.ReferencedProjectOptions
             logMap := Map.add opts.ProjectFile opts.LogOutput !logMap
             { ProjectFileName = opts.ProjectFile
@@ -33,18 +31,18 @@ type ProjectCracker =
         arguments.Append(' ').Append(enableLogging.ToString()) |> ignore
         for k, v in properties do
             arguments.Append(' ').Append(k).Append(' ').Append(v) |> ignore
-
+        let codebase = Path.GetDirectoryName(Uri(typeof<ProjectCracker>.Assembly.CodeBase).LocalPath)
+        
         let p = new System.Diagnostics.Process()
-        p.StartInfo.FileName <- Path.Combine(Path.GetDirectoryName(Reflection.Assembly.GetExecutingAssembly().Location),
-                                             "FSharp.Compiler.Service.ProjectCracker.Exe.exe")
+        p.StartInfo.FileName <- Path.Combine(codebase,"FSharp.Compiler.Service.ProjectCracker.Exe.exe")
         p.StartInfo.Arguments <- arguments.ToString()
         p.StartInfo.UseShellExecute <- false
         p.StartInfo.CreateNoWindow <- true
         p.StartInfo.RedirectStandardOutput <- true
         ignore <| p.Start()
 
         let fmt = new Serialization.Formatters.Binary.BinaryFormatter()
-        let opts = fmt.Deserialize(p.StandardOutput.BaseStream) :?> FSharp.Compiler.Service.ProjectCracker.Exe.ProjectOptions
+        let opts = fmt.Deserialize(p.StandardOutput.BaseStream) :?> Microsoft.FSharp.Compiler.SourceCodeServices.ProjectCracker.Exe.ProjectOptions
         p.WaitForExit()
 
         convert opts, !logMap

tests/service/ExprTests.fs

@@ -2,6 +2,7 @@
 #if INTERACTIVE
 #r "../../bin/v4.5/FSharp.Compiler.Service.dll"
 #r "../../bin/v4.5/FSharp.Compiler.Service.ProjectCracker.dll"
+#r "../../bin/v4.5/FSharp.Compiler.Service.ProjectCracker.Exe.exe"
 #r "../../packages/NUnit/lib/nunit.framework.dll"
 #load "FsUnit.fs"
 #load "Common.fs"

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

@@ -86,6 +86,11 @@
     <Reference Include="Microsoft.Build, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(TargetFrameworkVersion)' == 'v4.5'" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\src\fsharp\FSharp.Compiler.Service.ProjectCracker.Exe\FSharp.Compiler.Service.ProjectCracker.Exe.fsproj">
+      <Name>FSharp.Compiler.Service.ProjectCracker.Exe</Name>
+      <Project>{b1bdd96d-47e1-4e65-8107-fbae23a06db4}</Project>
+      <Private>True</Private>
+    </ProjectReference>
     <ProjectReference Include="..\..\src\fsharp\FSharp.Compiler.Service.ProjectCracker\FSharp.Compiler.Service.ProjectCracker.fsproj">
       <Name>FSharp.Compiler.Service.ProjectCracker</Name>
       <Project>{893c3cd9-5af8-4027-a667-21e62fc2c703}</Project>

tests/service/MultiProjectAnalysisTests.fs

@@ -20,7 +20,6 @@ open System
 open System.Collections.Generic
 open Microsoft.FSharp.Compiler.SourceCodeServices
 open FSharp.Compiler.Service.Tests.Common
-open FSharp.Compiler.Service
 
 let numProjectsForStressTest = 100
 let checker = FSharpChecker.Create(projectCacheSize=numProjectsForStressTest + 10)

tests/service/ProjectOptionsTests.fs

@@ -15,7 +15,6 @@ open System.IO
 open NUnit.Framework
 open FsUnit
 open Microsoft.FSharp.Compiler.SourceCodeServices
-open FSharp.Compiler.Service
 
 open FSharp.Compiler.Service.Tests.Common