Skip to content

Commit 72117ef

Browse files
alfonsogarciacaroalfonsogarciacaro
committed
Bump version to 4.1.3
1 parent d05fcb8 commit 72117ef

File tree

9 files changed

+36
-74
lines changed

9 files changed

+36
-74
lines changed

‎.paket/Paket.Restore.targets‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,26 @@
1111
<PaketRootPath>$(MSBuildThisFileDirectory)..\</PaketRootPath>
1212
<PaketRestoreCacheFile>$(PaketRootPath)paket-files\paket.restore.cached</PaketRestoreCacheFile>
1313
<PaketLockFilePath>$(PaketRootPath)paket.lock</PaketLockFilePath>
14+
<PaketBootstrapperStyle>classic</PaketBootstrapperStyle>
15+
<PaketBootstrapperStyle Condition="Exists('$(PaketToolsPath)paket.bootstrapper.proj')">proj</PaketBootstrapperStyle>
16+
<PaketExeImage>assembly</PaketExeImage>
17+
<PaketExeImage Condition=" '$(PaketBootstrapperStyle)' == 'proj' ">native</PaketExeImage>
1418
<MonoPath Condition="'$(MonoPath)' == '' And Exists('/Library/Frameworks/Mono.framework/Commands/mono')">/Library/Frameworks/Mono.framework/Commands/mono</MonoPath>
1519
<MonoPath Condition="'$(MonoPath)' == ''">mono</MonoPath>
1620
<!-- Paket command -->
21+
<PaketExePath Condition=" '$(PaketExePath)' == '' AND Exists('$(PaketToolsPath)paket')">$(PaketToolsPath)paket</PaketExePath>
1722
<PaketExePath Condition=" '$(PaketExePath)' == '' AND Exists('$(PaketRootPath)paket.exe')">$(PaketRootPath)paket.exe</PaketExePath>
18-
<PaketExePath Condition=" '$(PaketExePath)' == '' ">$(PaketToolsPath)paket.exe</PaketExePath>
19-
<PaketCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketExePath)"</PaketCommand>
20-
<PaketCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)"</PaketCommand>
2123

22-
<!-- .net core fdd -->
23-
<_PaketExeExtension>$([System.IO.Path]::GetExtension("$(PaketExePath)"))</_PaketExeExtension>
24-
<PaketCommand Condition=" '$(_PaketExeExtension)' == '.dll' ">dotnet "$(PaketExePath)"</PaketCommand>
24+
<PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' == 'Windows_NT' ">$(PaketToolsPath)paket.exe</PaketExePath>
25+
<PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' != 'Windows_NT' AND '$(PaketExeImage)' == 'assembly' ">$(PaketToolsPath)paket.exe</PaketExePath>
26+
<PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' != 'Windows_NT' AND '$(PaketExeImage)' == 'native' ">$(PaketToolsPath)paket</PaketExePath>
2527

26-
<!-- no extension is a shell script -->
27-
<PaketCommand Condition=" '$(_PaketExeExtension)' == '' ">"$(PaketExePath)"</PaketCommand>
28+
<!-- Paket command -->
29+
<_PaketExeExtension>$([System.IO.Path]::GetExtension("$(PaketExePath)"))</_PaketExeExtension>
30+
<PaketCommand Condition=" '$(PaketCommand)' == '' AND '$(_PaketExeExtension)' == '.dll' ">dotnet "$(PaketExePath)"</PaketCommand>
31+
<PaketCommand Condition=" '$(PaketCommand)' == '' AND '$(OS)' == 'Windows_NT'">"$(PaketExePath)"</PaketCommand>
32+
<PaketCommand Condition=" '$(PaketCommand)' == '' AND '$(OS)' != 'Windows_NT' AND '$(_PaketExeExtension)' == '.exe' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)"</PaketCommand>
33+
<PaketCommand Condition=" '$(PaketCommand)' == '' AND '$(OS)' != 'Windows_NT'">"$(PaketExePath)"</PaketCommand>
2834

2935
<PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' AND Exists('$(PaketRootPath)paket.bootstrapper.exe')">$(PaketRootPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
3036
<PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' ">$(PaketToolsPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
@@ -38,7 +44,11 @@
3844
<DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
3945
</PropertyGroup>
4046

41-
<Target Name="PaketRestore" Condition="'$(PaketRestoreDisabled)' != 'True'" BeforeTargets="_GenerateDotnetCliToolReferenceSpecs;_GenerateProjectRestoreGraphPerFramework;_GenerateRestoreGraphWalkPerFramework;CollectPackageReferences" >
47+
<Target Name="PaketBootstrapping" Condition="Exists('$(PaketToolsPath)paket.bootstrapper.proj')">
48+
<MSBuild Projects="$(PaketToolsPath)paket.bootstrapper.proj" Targets="Restore" />
49+
</Target>
50+
51+
<Target Name="PaketRestore" Condition="'$(PaketRestoreDisabled)' != 'True'" BeforeTargets="_GenerateDotnetCliToolReferenceSpecs;_GenerateProjectRestoreGraphPerFramework;_GenerateRestoreGraphWalkPerFramework;CollectPackageReferences" DependsOnTargets="PaketBootstrapping">
4252

4353
<!-- Step 1 Check if lockfile is properly restored -->
4454
<PropertyGroup>
@@ -77,7 +87,7 @@
7787
</PropertyGroup>
7888

7989
<!-- Do a global restore if required -->
80-
<Exec Command='$(PaketBootStrapperCommand)' Condition="Exists('$(PaketBootStrapperExePath)') AND !(Exists('$(PaketExePath)'))" ContinueOnError="false" />
90+
<Exec Command='$(PaketBootStrapperCommand)' Condition=" '$(PaketBootstrapperStyle)' == 'classic' AND Exists('$(PaketBootStrapperExePath)') AND !(Exists('$(PaketExePath)'))" ContinueOnError="false" />
8191
<Exec Command='$(PaketCommand) restore' Condition=" '$(PaketRestoreRequired)' == 'true' " ContinueOnError="false" />
8292

8393
<!-- Step 2 Detect project specific changes -->

‎paket.dependencies‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ framework: net46
1313

1414
source https://nuget.org/api/v2
1515
nuget FSharp.Core redirects:force, content:none
16-
nuget FAKE
16+
nuget FAKE ~> 4
1717
github fsharp/FAKE modules/Octokit/Octokit.fsx
18-
github fable-compiler/fake-helpers Fable.FakeHelpers.fs
18+
github fable-compiler/fake-helpers:fake_legacy Fable.FakeHelpers.fs

‎paket.lock‎

Lines changed: 3 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -302,67 +302,12 @@ GROUP Build
302302
RESTRICTION: == net46
303303
NUGET
304304
remote: https://www.nuget.org/api/v2
305-
FAKE (5.3)
306-
Fake.Core.Context (5.7.2)
307-
FSharp.Core (>= 4.3.4)
308-
Fake.Core.Environment (5.7.2)
309-
FSharp.Core (>= 4.3.4)
310-
Fake.Core.FakeVar (5.7.2)
311-
Fake.Core.Context (>= 5.7.2)
312-
FSharp.Core (>= 4.3.4)
313-
Fake.Core.Process (5.7.2)
314-
Fake.Core.Environment (>= 5.7.2)
315-
Fake.Core.FakeVar (>= 5.7.2)
316-
Fake.Core.String (>= 5.7.2)
317-
Fake.Core.Trace (>= 5.7.2)
318-
Fake.IO.FileSystem (>= 5.7.2)
319-
FSharp.Core (>= 4.3.4)
320-
System.Diagnostics.Process (>= 4.3)
321-
Fake.Core.ReleaseNotes (5.7.2)
322-
Fake.Core.SemVer (>= 5.7.2)
323-
Fake.Core.String (>= 5.7.2)
324-
FSharp.Core (>= 4.3.4)
325-
Fake.Core.SemVer (5.7.2)
326-
FSharp.Core (>= 4.3.4)
327-
System.Runtime.Numerics (>= 4.3)
328-
Fake.Core.String (5.7.2)
329-
FSharp.Core (>= 4.3.4)
330-
Fake.Core.Trace (5.7.2)
331-
Fake.Core.Environment (>= 5.7.2)
332-
Fake.Core.FakeVar (>= 5.7.2)
333-
FSharp.Core (>= 4.3.4)
334-
Fake.Core.UserInput (5.7.2)
335-
FSharp.Core (>= 4.3.4)
336-
Fake.DotNet.Cli (5.7.2)
337-
Fake.IO.FileSystem (5.7.2)
338-
Fake.Core.String (>= 5.7.2)
339-
FSharp.Core (>= 4.3.4)
340-
System.Diagnostics.FileVersionInfo (>= 4.3)
341-
System.IO.FileSystem.Watcher (>= 4.3)
342-
Fake.Tools.Git (5.7.2)
343-
Fake.Core.Environment (>= 5.7.2)
344-
Fake.Core.Process (>= 5.7.2)
345-
Fake.Core.SemVer (>= 5.7.2)
346-
Fake.Core.String (>= 5.7.2)
347-
Fake.Core.Trace (>= 5.7.2)
348-
Fake.IO.FileSystem (>= 5.7.2)
349-
FSharp.Core (>= 4.3.4)
305+
FAKE (4.64.13)
350306
FSharp.Core (4.5.2) - content: none, redirects: force
351307
Octokit (0.32)
352-
System.Diagnostics.FileVersionInfo (4.3)
353-
System.Diagnostics.Process (4.3)
354-
System.IO.FileSystem.Watcher (4.3)
355-
System.Runtime.Numerics (4.3)
356308
GITHUB
357309
remote: fsharp/FAKE
358-
modules/Octokit/Octokit.fsx (16fa0088b1cce2f04a126e2febeddd2b8b6e6048)
310+
modules/Octokit/Octokit.fsx (3827f95ad533978ec14c29db92658f48b0609e05)
359311
Octokit (>= 0.20)
360312
remote: fable-compiler/fake-helpers
361-
Fable.FakeHelpers.fs (1b26f2cd88aab4895b1d330edf30f3852ea81652)
362-
Fake.Core.Process
363-
Fake.Core.ReleaseNotes
364-
Fake.Core.String
365-
Fake.Core.UserInput
366-
Fake.DotNet.Cli
367-
Fake.IO.FileSystem
368-
Fake.Tools.Git
313+
Fable.FakeHelpers.fs (46b48de9f1b532b63b015a9e2e2b22d150734728)

‎src/Fable.React/Fable.React.fsproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<Version>4.1.1</Version>
5-
<PackageVersion>4.1.1</PackageVersion>
4+
<Version>4.1.3</Version>
5+
<PackageVersion>4.1.3</PackageVersion>
66
<TargetFrameworks>netstandard2.0</TargetFrameworks>
77
<GenerateDocumentationFile>true</GenerateDocumentationFile>
88
</PropertyGroup>

‎src/Fable.React/RELEASE_NOTES.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
### 4.1.3
2+
3+
* Add bindings for `React.memo`
4+
* Add `nothing` helper
5+
16
### 4.1.1
27

38
* Mark `setState: 'S` as obsolete @SirUppyPancakes

‎src/Fable.ReactGoogleMaps/Fable.ReactGoogleMaps.fsproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<Version>0.5.0</Version>
5+
<PackageVersion>0.5.0</PackageVersion>
56
<TargetFramework>netstandard2.0</TargetFramework>
67
<GenerateDocumentationFile>true</GenerateDocumentationFile>
78
</PropertyGroup>

‎src/Fable.ReactLeaflet/Fable.ReactLeaflet.fsproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<Version>0.2.0</Version>
5+
<PackageVersion>0.2.0</PackageVersion>
56
<TargetFramework>netstandard2.0</TargetFramework>
67
<GenerateDocumentationFile>true</GenerateDocumentationFile>
78
</PropertyGroup>

‎src/Fable.Recharts.Sample/Fable.Recharts.Sample.fsproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<Version>0.1.0-beta-001</Version>
54
<TargetFramework>netstandard1.6</TargetFramework>
65
</PropertyGroup>
76
<ItemGroup>

‎src/Fable.Recharts/Fable.Recharts.fsproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<Version>0.1.0-beta-003</Version>
4+
<Version>0.1.0</Version>
5+
<PackageVersion>0.1.0-beta-003</PackageVersion>
56
<TargetFramework>netstandard1.6</TargetFramework>
67
<GenerateDocumentationFile>true</GenerateDocumentationFile>
78
</PropertyGroup>

0 commit comments

Comments
 (0)