Merge pull request #647 from dsyme/integrate-779

Integrate fsharp/master --> master

Author: dsyme

RELEASE_NOTES.md

@@ -1,3 +1,6 @@
+#### 8.0.0
+  * Integrate fsharp\fsharp and Microsoft\visualfsharp to c494a9cab525dbd89585f7b733ea5310471a8001
+
 #### 7.0.0
   * Integrate fsharp\fsharp and Microsoft\visualfsharp to 835b79c041f9032fceeceb39f680e0662cba92ec
 

build.fsx

@@ -89,7 +89,7 @@ Target "GenerateFSIStrings" (fun _ ->
  //   |> ignore
 )
 
-Target "Build" (fun _ ->
+Target "Build.NetFx" (fun _ ->
     netFrameworks
     |> List.iter (fun framework -> 
         !! (project + ".sln")
@@ -124,7 +124,7 @@ Target "SourceLink" (fun _ ->
 // --------------------------------------------------------------------------------------
 // Run the unit tests using test runner
 
-Target "RunTests" (fun _ ->
+Target "RunTests.NetFx" (fun _ ->
     !! (if isAppVeyorBuild then "./bin/v4.5/FSharp.Compiler.Service.Tests.dll" 
         else "./bin/**/FSharp.Compiler.Service.Tests.dll")
     |> NUnit (fun p ->
@@ -138,7 +138,7 @@ Target "RunTests" (fun _ ->
 // --------------------------------------------------------------------------------------
 // Build a NuGet package
 
-Target "NuGet" (fun _ ->
+Target "NuGet.NetFx" (fun _ ->
     Paket.Pack (fun p -> 
         { p with 
             TemplateFile = "nuget/FSharp.Compiler.Service.template"
@@ -281,28 +281,30 @@ Target "RunTests.NetCore" (fun _ ->
 //use dotnet-mergenupkg to merge the .netcore nuget package into the default one
 Target "Nuget.AddNetCore" (fun _ ->
     do
-        let nupkg = sprintf "../../../%s/FSharp.Compiler.Service.%s.nupkg" buildDir (release.AssemblyVersion)
-        let netcoreNupkg = sprintf "bin/Release/FSharp.Compiler.Service.%s.nupkg" (release.AssemblyVersion)
+        let nupkg = sprintf "../../../%s/FSharp.Compiler.Service.%s.nupkg" buildDir release.AssemblyVersion
+        let netcoreNupkg = sprintf "bin/Release/FSharp.Compiler.Service.%s.nupkg" release.AssemblyVersion
         runCmdIn "src/fsharp/FSharp.Compiler.Service" "dotnet" "mergenupkg --source %s --other %s --framework netstandard1.6" nupkg netcoreNupkg
 
     do
-        let nupkg = sprintf "../../../%s/FSharp.Compiler.Service.ProjectCracker.%s.nupkg" buildDir (release.AssemblyVersion)
-        let netcoreNupkg = sprintf "bin/Release/FSharp.Compiler.Service.ProjectCracker.%s.nupkg" (release.AssemblyVersion)
+        let nupkg = sprintf "../../../%s/FSharp.Compiler.Service.ProjectCracker.%s.nupkg" buildDir release.AssemblyVersion
+        let netcoreNupkg = sprintf "bin/Release/FSharp.Compiler.Service.ProjectCracker.%s.nupkg" release.AssemblyVersion
         runCmdIn "src/fsharp/FSharp.Compiler.Service.ProjectCracker" "dotnet" "mergenupkg --source %s --other %s --framework netstandard1.6" nupkg netcoreNupkg
 )
 
 // --------------------------------------------------------------------------------------
 // Run all targets by default. Invoke 'build <Target>' to override
 
-Target "Prepare" DoNothing
-Target "PrepareRelease" DoNothing
 Target "Release" DoNothing
 Target "CreatePackage" DoNothing
+Target "NuGet" DoNothing
 Target "All" DoNothing
 Target "All.NetCore" DoNothing
+Target "All.NetFx" DoNothing
 
 "Clean"
+  =?> ("BuildVersion", isAppVeyorBuild)
   ==> "AssemblyInfo"
+  ==> "GenerateFSIStrings"
   ==> "CodeGen.NetCore"
   ==> "Build.NetCore"
   ==> "RunTests.NetCore"
@@ -312,17 +314,25 @@ Target "All.NetCore" DoNothing
   =?> ("BuildVersion", isAppVeyorBuild)
   ==> "AssemblyInfo"
   ==> "GenerateFSIStrings"
-  ==> "Prepare"
-  ==> "Build"
-  ==> "RunTests"
+  ==> "Build.NetFx"
+  ==> "RunTests.NetFx"
+  ==> "All.NetFx"
+
+"All.NetFx"
   =?> ("All.NetCore", isDotnetSDKInstalled)
   ==> "All"
 
+"All.NetCore"
+  ==> "Nuget.AddNetCore"
+
+"All.NetFx"
+  ==> "NuGet.NetFx"
+  =?> ("Nuget.AddNetCore", isDotnetSDKInstalled)
+  ==> "NuGet"
+
 "All"
-  ==> "PrepareRelease" 
   ==> "SourceLink"
   ==> "NuGet"
-  =?> ("Nuget.AddNetCore", isDotnetSDKInstalled)
   ==> "CreatePackage"
   ==> "GitHubRelease"
   ==> "PublishNuGet"

nuget/FSharp.Compiler.Service.template

@@ -18,7 +18,6 @@ files
     ../bin/v4.5/FSharp.Compiler.Service.dll ==> lib/net45
     ../bin/v4.5/FSharp.Compiler.Service.xml ==> lib/net45
     ../bin/v4.5/FSharp.Compiler.Service.?db ==> lib/net45
-    ../bin/v4.5/FSharp.Compiler.Service.dll.?db ==> lib/net45
 dependencies
 	System.Collections.Immutable >= LOCKEDVERSION
 	System.Reflection.Metadata >= LOCKEDVERSION

nuget/projectcracker.template

@@ -16,8 +16,6 @@ files
     ../bin/v4.5/FSharp.Compiler.Service.ProjectCrackerTool.exe ==> utilities/net45
     ../bin/v4.5/FSharp.Compiler.Service.ProjectCrackerTool.exe.config ==> utilities/net45
     ../bin/v4.5/FSharp.Compiler.Service.ProjectCrackerTool.?db ==> utilities/net45
-    ../bin/v4.5/FSharp.Compiler.Service.ProjectCrackerTool.exe.?db ==> utilities/net45
     ../bin/v4.5/FSharp.Compiler.Service.ProjectCracker.dll ==> lib/net45
     ../bin/v4.5/FSharp.Compiler.Service.ProjectCracker.xml ==> lib/net45
     ../bin/v4.5/FSharp.Compiler.Service.ProjectCracker.?db ==> lib/net45
-    ../bin/v4.5/FSharp.Compiler.Service.ProjectCracker.dll.?db ==> lib/net45

samples/Tokenizer/Program.fs

@@ -1,6 +1,6 @@
 open Microsoft.FSharp.Compiler.SourceCodeServices
 
-let sourceTok = FSharpSourceTokenizer([], "C:\\test.fsx")
+let sourceTok = FSharpSourceTokenizer([], Some "C:\\test.fsx")
 
 let tokenizeLines (lines:string[]) =
   [ let state = ref 0L