Bump version to 4.1.3

fable-compiler · Nov 6, 2018 · 72117ef · 72117ef
1 parent d05fcb8
commit 72117ef
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 74 deletions.
diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets
@@ -11,20 +11,26 @@
     <PaketRootPath>$(MSBuildThisFileDirectory)..\</PaketRootPath>
     <PaketRestoreCacheFile>$(PaketRootPath)paket-files\paket.restore.cached</PaketRestoreCacheFile>
     <PaketLockFilePath>$(PaketRootPath)paket.lock</PaketLockFilePath>
+    <PaketBootstrapperStyle>classic</PaketBootstrapperStyle>
+    <PaketBootstrapperStyle Condition="Exists('$(PaketToolsPath)paket.bootstrapper.proj')">proj</PaketBootstrapperStyle>
+    <PaketExeImage>assembly</PaketExeImage>
+    <PaketExeImage Condition=" '$(PaketBootstrapperStyle)' == 'proj' ">native</PaketExeImage>
     <MonoPath Condition="'$(MonoPath)' == '' And Exists('/Library/Frameworks/Mono.framework/Commands/mono')">/Library/Frameworks/Mono.framework/Commands/mono</MonoPath>
     <MonoPath Condition="'$(MonoPath)' == ''">mono</MonoPath>
     <!-- Paket command -->
+    <PaketExePath Condition=" '$(PaketExePath)' == '' AND Exists('$(PaketToolsPath)paket')">$(PaketToolsPath)paket</PaketExePath>
     <PaketExePath Condition=" '$(PaketExePath)' == '' AND Exists('$(PaketRootPath)paket.exe')">$(PaketRootPath)paket.exe</PaketExePath>
-    <PaketExePath Condition=" '$(PaketExePath)' == '' ">$(PaketToolsPath)paket.exe</PaketExePath>
-    <PaketCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketExePath)"</PaketCommand>
-    <PaketCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)"</PaketCommand>
 
-    <!-- .net core fdd -->
-    <_PaketExeExtension>$([System.IO.Path]::GetExtension("$(PaketExePath)"))</_PaketExeExtension>
-    <PaketCommand Condition=" '$(_PaketExeExtension)' == '.dll' ">dotnet "$(PaketExePath)"</PaketCommand>
+    <PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' == 'Windows_NT' ">$(PaketToolsPath)paket.exe</PaketExePath>
+    <PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' != 'Windows_NT' AND '$(PaketExeImage)' == 'assembly' ">$(PaketToolsPath)paket.exe</PaketExePath>
+    <PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' != 'Windows_NT' AND '$(PaketExeImage)' == 'native' ">$(PaketToolsPath)paket</PaketExePath>
 
-    <!-- no extension is a shell script -->
-    <PaketCommand Condition=" '$(_PaketExeExtension)' == '' ">"$(PaketExePath)"</PaketCommand>
+    <!-- Paket command -->
+    <_PaketExeExtension>$([System.IO.Path]::GetExtension("$(PaketExePath)"))</_PaketExeExtension>
+    <PaketCommand Condition=" '$(PaketCommand)' == '' AND '$(_PaketExeExtension)' == '.dll' ">dotnet "$(PaketExePath)"</PaketCommand>
+    <PaketCommand Condition=" '$(PaketCommand)' == '' AND '$(OS)' == 'Windows_NT'">"$(PaketExePath)"</PaketCommand>
+    <PaketCommand Condition=" '$(PaketCommand)' == '' AND '$(OS)' != 'Windows_NT' AND '$(_PaketExeExtension)' == '.exe' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)"</PaketCommand>
+    <PaketCommand Condition=" '$(PaketCommand)' == '' AND '$(OS)' != 'Windows_NT'">"$(PaketExePath)"</PaketCommand>
 
     <PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' AND Exists('$(PaketRootPath)paket.bootstrapper.exe')">$(PaketRootPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
     <PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' ">$(PaketToolsPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
@@ -38,7 +44,11 @@
     <DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
   </PropertyGroup>
 
-  <Target Name="PaketRestore" Condition="'$(PaketRestoreDisabled)' != 'True'" BeforeTargets="_GenerateDotnetCliToolReferenceSpecs;_GenerateProjectRestoreGraphPerFramework;_GenerateRestoreGraphWalkPerFramework;CollectPackageReferences" >
+  <Target Name="PaketBootstrapping" Condition="Exists('$(PaketToolsPath)paket.bootstrapper.proj')">
+    <MSBuild Projects="$(PaketToolsPath)paket.bootstrapper.proj" Targets="Restore" />
+  </Target>
+
+  <Target Name="PaketRestore" Condition="'$(PaketRestoreDisabled)' != 'True'" BeforeTargets="_GenerateDotnetCliToolReferenceSpecs;_GenerateProjectRestoreGraphPerFramework;_GenerateRestoreGraphWalkPerFramework;CollectPackageReferences" DependsOnTargets="PaketBootstrapping">
 
     <!-- Step 1 Check if lockfile is properly restored -->
     <PropertyGroup>
@@ -77,7 +87,7 @@
     </PropertyGroup>
 
     <!-- Do a global restore if required -->
-    <Exec Command='$(PaketBootStrapperCommand)' Condition="Exists('$(PaketBootStrapperExePath)') AND !(Exists('$(PaketExePath)'))" ContinueOnError="false" />
+    <Exec Command='$(PaketBootStrapperCommand)' Condition=" '$(PaketBootstrapperStyle)' == 'classic' AND Exists('$(PaketBootStrapperExePath)') AND !(Exists('$(PaketExePath)'))" ContinueOnError="false" />
     <Exec Command='$(PaketCommand) restore' Condition=" '$(PaketRestoreRequired)' == 'true' " ContinueOnError="false" />
 
     <!-- Step 2 Detect project specific changes -->

diff --git 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
@@ -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
+    Fable.FakeHelpers.fs (46b48de9f1b532b63b015a9e2e2b22d150734728)
diff --git a/src/Fable.React/Fable.React.fsproj b/src/Fable.React/Fable.React.fsproj
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Version>4.1.1</Version>
-    <PackageVersion>4.1.1</PackageVersion>
+    <Version>4.1.3</Version>
+    <PackageVersion>4.1.3</PackageVersion>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>

diff --git 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
@@ -2,6 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Version>0.5.0</Version>
+    <PackageVersion>0.5.0</PackageVersion>
     <TargetFramework>netstandard2.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>

diff --git a/src/Fable.ReactLeaflet/Fable.ReactLeaflet.fsproj b/src/Fable.ReactLeaflet/Fable.ReactLeaflet.fsproj
@@ -2,6 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Version>0.2.0</Version>
+    <PackageVersion>0.2.0</PackageVersion>
     <TargetFramework>netstandard2.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>

diff --git a/src/Fable.Recharts.Sample/Fable.Recharts.Sample.fsproj b/src/Fable.Recharts.Sample/Fable.Recharts.Sample.fsproj
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Version>0.1.0-beta-001</Version>
     <TargetFramework>netstandard1.6</TargetFramework>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/Fable.Recharts/Fable.Recharts.fsproj b/src/Fable.Recharts/Fable.Recharts.fsproj
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Version>0.1.0-beta-003</Version>
+    <Version>0.1.0</Version>
+    <PackageVersion>0.1.0-beta-003</PackageVersion>
     <TargetFramework>netstandard1.6</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>