From dd13e3634602626035fae8fda96e7ce7365dce68 Mon Sep 17 00:00:00 2001
From: ncave <test2@hotmail.com>
Date: Thu, 16 Feb 2017 11:23:53 -0800
Subject: [PATCH 1/2] Added GetProjectOptionsFromScript test

---
 global.json                           |  5 ++++-
 tests/service/ProjectAnalysisTests.fs | 25 ++++++++++++++++++++++++-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/global.json b/global.json
index 6e0ba32b5d..245a03dea6 100644
--- a/global.json
+++ b/global.json
@@ -1,3 +1,6 @@
 {
-  "projects": [ "src/fsharp", "tests" ]
+  "projects": [ "src/fsharp", "tests" ],
+  "sdk": {
+    "version": "1.0.0-preview2-003131"
+  }
 }
diff --git a/tests/service/ProjectAnalysisTests.fs b/tests/service/ProjectAnalysisTests.fs
index 2c0f114ee4..26e3bb250f 100644
--- a/tests/service/ProjectAnalysisTests.fs
+++ b/tests/service/ProjectAnalysisTests.fs
@@ -4505,10 +4505,16 @@ module Project35b =
     open System.IO
 
     let fileName1 = Path.ChangeExtension(Path.GetTempFileName(), ".fsx")
+#if DOTNETCORE
+    let fileSource1 = """
+#r "System.Private.CoreLib.dll"
+#r "notexist.dll"
+"""
+#else
     let fileSource1 = """
-#r "System.dll"
 #r "notexist.dll"
 """
+#endif
     File.WriteAllText(fileName1, fileSource1)
     let cleanFileName a = if a = fileName1 then "file1" else "??"
 
@@ -4523,6 +4529,23 @@ module Project35b =
     let options = checker.GetProjectOptionsFromScript(fileName1, fileSource1) |> Async.RunSynchronously
 #endif
 
+[<Test>]
+let ``Test Project35b whole project errors`` () = 
+#if DOTNETCORE
+    let options = checker.GetProjectOptionsFromScript(Project35b.fileName1, Project35b.fileSource1, assumeDotNetFramework=false) |> Async.RunSynchronously
+#else
+    let options = checker.GetProjectOptionsFromScript(Project35b.fileName1, Project35b.fileSource1) |> Async.RunSynchronously
+#endif
+    let wholeProjectResults = checker.ParseAndCheckProject(options) |> Async.RunSynchronously
+    for e in wholeProjectResults.Errors do 
+        printfn "Project35b error: <<<%s>>>" e.Message
+    wholeProjectResults.Errors.Length
+#if DOTNETCORE
+    |> shouldEqual 1
+#else
+    |> shouldEqual 2
+#endif
+
 [<Test>]
 let ``Test project35b Dependency files for ParseAndCheckFileInProject`` () =
     let checkFileResults = 

From 9495f283047d07e1d1bae486e8d9cbb423534a21 Mon Sep 17 00:00:00 2001
From: ncave <test2@hotmail.com>
Date: Fri, 17 Feb 2017 08:50:26 -0800
Subject: [PATCH 2/2] nop

---
 tests/service/ProjectAnalysisTests.fs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/service/ProjectAnalysisTests.fs b/tests/service/ProjectAnalysisTests.fs
index 26e3bb250f..d2d33f8166 100644
--- a/tests/service/ProjectAnalysisTests.fs
+++ b/tests/service/ProjectAnalysisTests.fs
@@ -4530,7 +4530,7 @@ module Project35b =
 #endif
 
 [<Test>]
-let ``Test Project35b whole project errors`` () = 
+let ``Test Project35b whole project errors`` () =
 #if DOTNETCORE
     let options = checker.GetProjectOptionsFromScript(Project35b.fileName1, Project35b.fileSource1, assumeDotNetFramework=false) |> Async.RunSynchronously
 #else