diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets index feb52234..9e746ff1 100644 --- a/.paket/Paket.Restore.targets +++ b/.paket/Paket.Restore.targets @@ -11,20 +11,26 @@ $(MSBuildThisFileDirectory)..\ $(PaketRootPath)paket-files\paket.restore.cached $(PaketRootPath)paket.lock + classic + proj + assembly + native /Library/Frameworks/Mono.framework/Commands/mono mono + $(PaketToolsPath)paket $(PaketRootPath)paket.exe - $(PaketToolsPath)paket.exe - "$(PaketExePath)" - $(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)" - - <_PaketExeExtension>$([System.IO.Path]::GetExtension("$(PaketExePath)")) - dotnet "$(PaketExePath)" + $(PaketToolsPath)paket.exe + $(PaketToolsPath)paket.exe + $(PaketToolsPath)paket - - "$(PaketExePath)" + + <_PaketExeExtension>$([System.IO.Path]::GetExtension("$(PaketExePath)")) + dotnet "$(PaketExePath)" + "$(PaketExePath)" + $(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)" + "$(PaketExePath)" $(PaketRootPath)paket.bootstrapper.exe $(PaketToolsPath)paket.bootstrapper.exe @@ -38,7 +44,11 @@ true - + + + + + @@ -77,7 +87,7 @@ - + diff --git a/paket.dependencies b/paket.dependencies index 9267621e..f30c4b8d 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -13,6 +13,6 @@ framework: net46 source https://nuget.org/api/v2 nuget FSharp.Core redirects:force, content:none - nuget FAKE + nuget FAKE ~> 4 github fsharp/FAKE modules/Octokit/Octokit.fsx - github fable-compiler/fake-helpers Fable.FakeHelpers.fs + github fable-compiler/fake-helpers:fake_legacy Fable.FakeHelpers.fs diff --git a/paket.lock b/paket.lock index 959e22e1..00c6c80a 100644 --- a/paket.lock +++ b/paket.lock @@ -302,67 +302,12 @@ GROUP Build RESTRICTION: == net46 NUGET remote: https://www.nuget.org/api/v2 - FAKE (5.3) - Fake.Core.Context (5.7.2) - FSharp.Core (>= 4.3.4) - Fake.Core.Environment (5.7.2) - FSharp.Core (>= 4.3.4) - Fake.Core.FakeVar (5.7.2) - Fake.Core.Context (>= 5.7.2) - FSharp.Core (>= 4.3.4) - Fake.Core.Process (5.7.2) - Fake.Core.Environment (>= 5.7.2) - Fake.Core.FakeVar (>= 5.7.2) - Fake.Core.String (>= 5.7.2) - Fake.Core.Trace (>= 5.7.2) - Fake.IO.FileSystem (>= 5.7.2) - FSharp.Core (>= 4.3.4) - System.Diagnostics.Process (>= 4.3) - Fake.Core.ReleaseNotes (5.7.2) - Fake.Core.SemVer (>= 5.7.2) - Fake.Core.String (>= 5.7.2) - FSharp.Core (>= 4.3.4) - Fake.Core.SemVer (5.7.2) - FSharp.Core (>= 4.3.4) - System.Runtime.Numerics (>= 4.3) - Fake.Core.String (5.7.2) - FSharp.Core (>= 4.3.4) - Fake.Core.Trace (5.7.2) - Fake.Core.Environment (>= 5.7.2) - Fake.Core.FakeVar (>= 5.7.2) - FSharp.Core (>= 4.3.4) - Fake.Core.UserInput (5.7.2) - FSharp.Core (>= 4.3.4) - Fake.DotNet.Cli (5.7.2) - Fake.IO.FileSystem (5.7.2) - Fake.Core.String (>= 5.7.2) - FSharp.Core (>= 4.3.4) - System.Diagnostics.FileVersionInfo (>= 4.3) - System.IO.FileSystem.Watcher (>= 4.3) - Fake.Tools.Git (5.7.2) - Fake.Core.Environment (>= 5.7.2) - Fake.Core.Process (>= 5.7.2) - Fake.Core.SemVer (>= 5.7.2) - Fake.Core.String (>= 5.7.2) - Fake.Core.Trace (>= 5.7.2) - Fake.IO.FileSystem (>= 5.7.2) - FSharp.Core (>= 4.3.4) + FAKE (4.64.13) FSharp.Core (4.5.2) - content: none, redirects: force Octokit (0.32) - System.Diagnostics.FileVersionInfo (4.3) - System.Diagnostics.Process (4.3) - System.IO.FileSystem.Watcher (4.3) - System.Runtime.Numerics (4.3) GITHUB remote: fsharp/FAKE - modules/Octokit/Octokit.fsx (16fa0088b1cce2f04a126e2febeddd2b8b6e6048) + modules/Octokit/Octokit.fsx (3827f95ad533978ec14c29db92658f48b0609e05) Octokit (>= 0.20) remote: fable-compiler/fake-helpers - Fable.FakeHelpers.fs (1b26f2cd88aab4895b1d330edf30f3852ea81652) - Fake.Core.Process - Fake.Core.ReleaseNotes - Fake.Core.String - Fake.Core.UserInput - Fake.DotNet.Cli - Fake.IO.FileSystem - Fake.Tools.Git \ No newline at end of file + Fable.FakeHelpers.fs (46b48de9f1b532b63b015a9e2e2b22d150734728) \ No newline at end of file diff --git a/src/Fable.React/Fable.React.fsproj b/src/Fable.React/Fable.React.fsproj index e5487f70..16945138 100644 --- a/src/Fable.React/Fable.React.fsproj +++ b/src/Fable.React/Fable.React.fsproj @@ -1,8 +1,8 @@ - 4.1.1 - 4.1.1 + 4.1.3 + 4.1.3 netstandard2.0 true diff --git a/src/Fable.React/RELEASE_NOTES.md b/src/Fable.React/RELEASE_NOTES.md index 3a053cd1..f1b23340 100644 --- a/src/Fable.React/RELEASE_NOTES.md +++ b/src/Fable.React/RELEASE_NOTES.md @@ -1,3 +1,8 @@ +### 4.1.3 + +* Add bindings for `React.memo` +* Add `nothing` helper + ### 4.1.1 * Mark `setState: 'S` as obsolete @SirUppyPancakes diff --git a/src/Fable.ReactGoogleMaps/Fable.ReactGoogleMaps.fsproj b/src/Fable.ReactGoogleMaps/Fable.ReactGoogleMaps.fsproj index 1358eebc..ace5631c 100644 --- a/src/Fable.ReactGoogleMaps/Fable.ReactGoogleMaps.fsproj +++ b/src/Fable.ReactGoogleMaps/Fable.ReactGoogleMaps.fsproj @@ -2,6 +2,7 @@ 0.5.0 + 0.5.0 netstandard2.0 true diff --git a/src/Fable.ReactLeaflet/Fable.ReactLeaflet.fsproj b/src/Fable.ReactLeaflet/Fable.ReactLeaflet.fsproj index 5853cb95..4f3bf86f 100644 --- a/src/Fable.ReactLeaflet/Fable.ReactLeaflet.fsproj +++ b/src/Fable.ReactLeaflet/Fable.ReactLeaflet.fsproj @@ -2,6 +2,7 @@ 0.2.0 + 0.2.0 netstandard2.0 true diff --git a/src/Fable.Recharts.Sample/Fable.Recharts.Sample.fsproj b/src/Fable.Recharts.Sample/Fable.Recharts.Sample.fsproj index b0d916d6..25fbe962 100644 --- a/src/Fable.Recharts.Sample/Fable.Recharts.Sample.fsproj +++ b/src/Fable.Recharts.Sample/Fable.Recharts.Sample.fsproj @@ -1,7 +1,6 @@ - 0.1.0-beta-001 netstandard1.6 diff --git a/src/Fable.Recharts/Fable.Recharts.fsproj b/src/Fable.Recharts/Fable.Recharts.fsproj index 3f1ce1a4..b1491931 100644 --- a/src/Fable.Recharts/Fable.Recharts.fsproj +++ b/src/Fable.Recharts/Fable.Recharts.fsproj @@ -1,7 +1,8 @@ - 0.1.0-beta-003 + 0.1.0 + 0.1.0-beta-003 netstandard1.6 true