updates to build

Author: dsyme

.travis.yml

@@ -15,12 +15,12 @@ install:
 script: 
   - ./build.sh NuGet
 
-# See bug "https://bugzilla.xamarin.com/show_bug.cgi?id=41914"
-# peverify failing on Mono latest with "condition `res != EINVAL' not met", on OSX
+# Fails on Travis Linux Mono latest (4.6.1) because FSharp.Core PCLs are not installed, see
+# https://github.com/fsharp/fsharp/issues/623#issuecomment-253165838
 
 matrix:
   allow_failures:
-    - os: osx
+    - os: linux
       mono: latest
 
 

build.fsx

@@ -281,13 +281,13 @@ 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/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/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
 )
 

nuget/FSharp.Compiler.Service.template

@@ -20,6 +20,7 @@ files
     ../bin/v4.5/FSharp.Compiler.Service.?db ==> lib/net45
     ../bin/v4.5/FSharp.Compiler.Service.dll.?db ==> lib/net45
     ../bin/v4.5/FSharp.Compiler.Service.MSBuild.v12.dll ==> lib/net45
+    ../bin/v4.5/FSharp.Compiler.Service.MSBuild.v14.dll ==> 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

src/fsharp/FSharp.Compiler.Service.ProjectCracker/project.json

@@ -1,5 +1,5 @@
 {
-  "version": "7.0.0",
+  "version": "8.0.0",
   "buildOptions": {
     "debugType": "portable",
     "emitEntryPoint": false,
@@ -36,7 +36,7 @@
     "Microsoft.Build.Utilities.Core": "14.3.0",
     "System.Runtime.Serialization.Json": "4.0.2",
     "FSharp.Compiler.Service": {
-      "version": "7.0.0",
+      "version": "8.0.0",
       "target": "project"
     }
   },

src/fsharp/FSharp.Compiler.Service/project.json

@@ -1,5 +1,5 @@
 {
-  "version": "7.0.0",
+  "version": "8.0.0",
   "buildOptions": {
     "debugType": "portable",
     "compilerName": "fsc",

src/fsharp/vs/SimpleServices.fsi

@@ -81,7 +81,7 @@ type SimpleCheckFileResults =
 type SimpleSourceCodeServices = 
 
     /// Create a singleton global isntance for checking and compiling F# scripts
-    new: unit -> SimpleSourceCodeServices
+    new: ?msbuildEnabled: bool * ?msbuildVersion : string-> SimpleSourceCodeServices
 
     /// Tokenize a single line, returning token information and a tokenization state represented by an integer
     member TokenizeLine: line:string * state:int64 -> FSharpTokenInfo [] * int64