ProjectCracker raises exception if ProjectCrackerTool returns non null ProjectCrackerOptions.Error (new field)

Author: vasily-kirichenko

fcs/FSharp.Compiler.Service.ProjectCracker/ProjectCracker.fs

@@ -17,6 +17,8 @@ type ProjectCracker =
         let logMap = ref Map.empty
 
         let rec convert (opts: ProjectCrackerTool.ProjectOptions) : FSharpProjectOptions =
+            if not (isNull opts.Error) then failwith opts.Error
+
             let referencedProjects = Array.map (fun (a, b) -> a, convert b) opts.ReferencedProjectOptions
 
             let sourceFiles, otherOptions = 
@@ -77,8 +79,8 @@ type ProjectCracker =
         p.StartInfo.RedirectStandardOutput <- true
         ignore <| p.Start()
 
-        let ser = new System.Runtime.Serialization.Json.DataContractJsonSerializer(typeof<Microsoft.FSharp.Compiler.SourceCodeServices.ProjectCrackerTool.ProjectOptions>)
-        let opts = ser.ReadObject(p.StandardOutput.BaseStream) :?> Microsoft.FSharp.Compiler.SourceCodeServices.ProjectCrackerTool.ProjectOptions
+        let ser = new DataContractJsonSerializer(typeof<ProjectCrackerTool.ProjectOptions>)
+        let opts = ser.ReadObject(p.StandardOutput.BaseStream) :?> ProjectCrackerTool.ProjectOptions
 #endif
 
         convert opts, !logMap

fcs/FSharp.Compiler.Service.ProjectCrackerTool/ProjectCrackerOptions.fs

@@ -7,4 +7,5 @@ type ProjectOptions =
     Options: string[]
     ReferencedProjectOptions: (string * ProjectOptions)[]
     LogOutput: string
+    Error: string
   }

fcs/FSharp.Compiler.Service.ProjectCrackerTool/ProjectCrackerTool.fs

@@ -420,7 +420,8 @@ module internal ProjectCrackerTool =
       let options = { ProjectFile = file
                       Options = Array.ofSeq (parsedProject.Options @ referencedProjectOutputs)
                       ReferencedProjectOptions = referencedProjectOptions
-                      LogOutput = parsedProject.LogOutput }
+                      LogOutput = parsedProject.LogOutput 
+                      Error = null }
 
       parsedProject.OutputFile, options
 
@@ -465,9 +466,11 @@ module internal ProjectCrackerTool =
               2, { ProjectFile = projectFile;
                    Options = [||];
                    ReferencedProjectOptions = [||];
-                   LogOutput = e.ToString() }
+                   LogOutput = e.ToString() 
+                   Error = e.Message }
       else
           1, { ProjectFile = "";
                Options = [||];
                ReferencedProjectOptions = [||];
-               LogOutput = "At least two arguments required." }
+               LogOutput = "At least two arguments required." 
+               Error = null }

tests/service/ProjectOptionsTests.fs

@@ -137,8 +137,11 @@ let ``Project file parsing -- compile files 2``() =
 [<Test>]
 let ``Project file parsing -- bad project file``() =
   let f = normalizePath (__SOURCE_DIRECTORY__ + @"/data/Malformed.fsproj")
-  let log = snd (ProjectCracker.GetProjectOptionsFromProjectFileLogged(f))
-  log.[f] |> should contain "Microsoft.Build.Exceptions.InvalidProjectFileException"
+  try 
+    ProjectCracker.GetProjectOptionsFromProjectFileLogged(f) |> ignore
+    failwith "Expected exception"
+  with 
+  | e -> Assert.That(e.Message, Contains.Substring "The project file could not be loaded.")
 
 [<Test>]
 let ``Project file parsing -- non-existent project file``() =