diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index d4e234cf28..7e7305dcc7 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,3 +1,6 @@ +#### 12.0.7 + * Integrate visualfsharp master + #### 12.0.6 * [758: Fix project cracker when invalid path given](https://github.com/fsharp/FSharp.Compiler.Service/pull/758) diff --git a/paket.dependencies b/paket.dependencies index 24f756583d..797178f01e 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -9,12 +9,13 @@ nuget SQLite.Net-PCL 3.0.5 nuget SQLite.Net.Platform.Generic 2.4.1 # build dependencies -nuget FAKE +# FAKE 4.53.0 is needed - latest FAKE invokes msbuild on Unix but on Mono 4.8.x that causes a failure with +nuget FAKE 4.53.0 nuget FSharp.Formatting nuget SourceLink.Fake nuget FsLexYacc nuget FSharp.Core 4.0.0.1 -nuget FSharp.Compiler.Tools 4.1.5 +nuget FSharp.Compiler.Tools 4.1.17 nuget System.ValueTuple 4.3.0 nuget System.Collections.Immutable 1.3.1 diff --git a/paket.lock b/paket.lock index f7d05ad647..4922444b9a 100644 --- a/paket.lock +++ b/paket.lock @@ -1,9 +1,9 @@ FRAMEWORK: NET45, NETSTANDARD16, NETCORE10 NUGET remote: https://www.nuget.org/api/v2 - FAKE (4.59) + FAKE (4.53) FSharp.Compiler.Service (2.0.0.6) - FSharp.Compiler.Tools (4.1.5) + FSharp.Compiler.Tools (4.1.17) FSharp.Core (4.0.0.1) FSharp.Formatting (2.14.4) FSharp.Compiler.Service (2.0.0.6) @@ -186,5 +186,5 @@ NUGET System.Runtime (>= 4.3) - framework: netstandard16 GITHUB remote: fsharp/FAKE - modules/Octokit/Octokit.fsx (b865703d2b8e6b5530403f4140e3272aab55ed9b) + modules/Octokit/Octokit.fsx (af1b29f23ae502549ec9468eaabb583c758af683) Octokit (>= 0.20) \ No newline at end of file diff --git a/src/fsharp/FSharp.Compiler.Service.ProjectCracker/FSharp.Compiler.Service.ProjectCracker.netcore.fsproj b/src/fsharp/FSharp.Compiler.Service.ProjectCracker/FSharp.Compiler.Service.ProjectCracker.netcore.fsproj index 6098ea81a8..b09b8557cb 100755 --- a/src/fsharp/FSharp.Compiler.Service.ProjectCracker/FSharp.Compiler.Service.ProjectCracker.netcore.fsproj +++ b/src/fsharp/FSharp.Compiler.Service.ProjectCracker/FSharp.Compiler.Service.ProjectCracker.netcore.fsproj @@ -1,6 +1,6 @@ - 12.0.6 + 12.0.7 netstandard1.6 Library $(DefineConstants);DOTNETCORE; diff --git a/src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.netcore.fsproj b/src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.netcore.fsproj index 4b98325ca9..a7f35eb8f8 100755 --- a/src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.netcore.fsproj +++ b/src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.netcore.fsproj @@ -1,6 +1,6 @@ - 12.0.6 + 12.0.7 netstandard1.6 FSharp.Compiler.Service $(DefineConstants);BUILDING_WITH_LKG