Skip to content

Commit 6551eb9

Browse files
Krzysztof-CieslakKrzysztof-Cieslak
committed
Update deps
1 parent abd3aa3 commit 6551eb9

File tree

4 files changed

+22
-25
lines changed

4 files changed

+22
-25
lines changed

‎.paket/Paket.Restore.targets‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,10 @@
7171
<PaketRestoreRequired Condition=" '$(PaketRestoreLockFileHash)' == '$(PaketRestoreCachedHash)' ">false</PaketRestoreRequired>
7272
<PaketRestoreRequired Condition=" '$(PaketRestoreLockFileHash)' == '' ">true</PaketRestoreRequired>
7373
</PropertyGroup>
74-
74+
75+
<PropertyGroup Condition="'$(PaketPropsVersion)' != '5.174.0' ">
76+
<PaketRestoreRequired>true</PaketRestoreRequired>
77+
</PropertyGroup>
7578

7679
<!-- Do a global restore if required -->
7780
<Exec Command='$(PaketBootStrapperCommand)' Condition="Exists('$(PaketBootStrapperExePath)') AND !(Exists('$(PaketExePath)'))" ContinueOnError="false" />
@@ -132,11 +135,11 @@
132135
<Error Condition=" '$(DoAllResolvedFilesExist)' != 'true' AND '$(ResolveNuGetPackages)' != 'False' " Text="One Paket file '@(PaketResolvedFilePaths)' is missing while restoring $(MSBuildProjectFile). Please delete 'paket-files/paket.restore.cached' and call 'paket restore'." />
133136

134137
<!-- Step 4 forward all msbuild properties (PackageReference, DotNetCliToolReference) to msbuild -->
135-
<ReadLinesFromFile Condition="'@(PaketResolvedFilePaths)' != ''" File="%(PaketResolvedFilePaths.Identity)" ><!--Condition="Exists('%(PaketResolvedFilePaths.Identity)')"-->
138+
<ReadLinesFromFile Condition="$(DesignTimeBuild) != true AND '@(PaketResolvedFilePaths)' != ''" File="%(PaketResolvedFilePaths.Identity)" >
136139
<Output TaskParameter="Lines" ItemName="PaketReferencesFileLines"/>
137140
</ReadLinesFromFile>
138141

139-
<ItemGroup Condition=" '@(PaketReferencesFileLines)' != '' " >
142+
<ItemGroup Condition="$(DesignTimeBuild) != true AND '@(PaketReferencesFileLines)' != '' " >
140143
<PaketReferencesFileLinesInfo Include="@(PaketReferencesFileLines)" >
141144
<PackageName>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[0])</PackageName>
142145
<PackageVersion>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[1])</PackageVersion>

‎paket.dependencies‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
source https://nuget.org/api/v2
22
storage:none
33

4-
clitool dotnet-fable 1.2.4
5-
nuget Fable.Core 1.2.4
6-
nuget Fable.Import.Node 0.1.5
4+
clitool dotnet-fable
5+
nuget Fable.Core
6+
nuget Fable.Import.Node
77
nuget FSharp.Core
88

99
git https://github.com/ionide/ionide-fsgrammar.git master

‎paket.lock‎

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,27 @@
11
STORAGE: NONE
22
NUGET
33
remote: https://www.nuget.org/api/v2
4-
dotnet-fable (1.2.4) - clitool: true
5-
Dotnet.ProjInfo (>= 0.7.4) - restriction: >= netcoreapp2.0
6-
Fable.Compiler (>= 1.2.4) - restriction: >= netcoreapp2.0
7-
Fable.Core (>= 1.2.4) - restriction: >= netcoreapp2.0
4+
dotnet-fable (1.3.17) - clitool: true
5+
Dotnet.ProjInfo (>= 0.9) - restriction: >= netcoreapp2.0
6+
Fable.Compiler (>= 1.3.17) - restriction: >= netcoreapp2.0
7+
Fable.Core (>= 1.3.17) - restriction: >= netcoreapp2.0
88
FSharp.Core (>= 4.2.3) - restriction: >= netcoreapp2.0
99
Microsoft.NETCore.App (>= 2.0) - restriction: >= netcoreapp2.0
1010
Dotnet.ProjInfo (0.9) - restriction: >= netcoreapp2.0
1111
FSharp.Core (>= 4.2.3) - restriction: && (< net45) (>= netstandard2.0)
12-
Fable.Compiler (1.2.4) - restriction: >= netcoreapp2.0
13-
Fable.Core (>= 1.2.4) - restriction: >= netstandard1.6
14-
FSharp.Compiler.Service (>= 14.0.2) - restriction: >= netstandard1.6
12+
Fable.Compiler (1.3.17) - restriction: >= netcoreapp2.0
13+
Fable.Core (>= 1.3.17) - restriction: >= netstandard1.6
14+
FSharp.Compiler.Service (>= 20.0.1) - restriction: >= netstandard1.6
1515
FSharp.Core (>= 4.2.3) - restriction: >= netstandard1.6
16-
NETStandard.Library (>= 1.6.1) - restriction: >= netstandard1.6
17-
Newtonsoft.Json (>= 10.0.3) - restriction: >= netstandard1.6
16+
Newtonsoft.Json (>= 11.0.1) - restriction: >= netstandard1.6
1817
System.Collections.Immutable (>= 1.4) - restriction: >= netstandard1.6
1918
System.Reflection.Metadata (>= 1.5) - restriction: >= netstandard1.6
2019
System.Runtime.Loader (>= 4.3) - restriction: >= netstandard1.6
21-
System.ValueTuple (>= 4.4) - restriction: >= netstandard1.6
22-
Fable.Core (1.2.4)
20+
Fable.Core (1.3.17)
2321
FSharp.Core (>= 4.2.3) - restriction: >= netstandard1.6
2422
NETStandard.Library (>= 1.6.1) - restriction: >= netstandard1.6
25-
System.ValueTuple (>= 4.4) - restriction: >= netstandard1.6
26-
Fable.Import.Node (0.1.5)
27-
Fable.Core (>= 1.1.15) - restriction: >= netstandard1.6
28-
FSharp.Core (>= 4.2.3) - restriction: >= netstandard1.6
23+
Fable.Import.Node (0.4.3)
24+
Fable.Core (>= 1.3.8) - restriction: >= netstandard2.0
2925
FSharp.Compiler.Service (23.0.3) - restriction: >= netcoreapp2.0
3026
FSharp.Core (>= 4.1.18) - restriction: || (>= net45) (>= netstandard2.0)
3127
System.Collections.Immutable (>= 1.3.1) - restriction: || (>= net45) (>= netstandard2.0)
@@ -620,8 +616,6 @@ NUGET
620616
Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net451) (>= netstandard1.2) (< win81) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net451+win81+wpa81)
621617
Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net451) (>= netstandard1.2) (< win81) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net451+win81+wpa81)
622618
System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net451) (>= netstandard1.2) (< win81) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net451+win81+wpa81)
623-
System.ValueTuple (4.5) - restriction: >= netstandard1.6
624-
NETStandard.Library (>= 1.6.1) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< netstandard2.0) (< win8) (< wp8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
625619
System.Xml.ReaderWriter (4.3.1) - restriction: || (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (>= net46) (< netstandard1.4) (>= netstandard1.6)) (&& (< netstandard1.3) (>= netstandard1.6) (>= uap10.0) (< win8) (< wpa81)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (>= netstandard1.6) (< portable-net45+win8+wp8+wpa81)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81))
626620
System.Collections (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wp8+wpa81)
627621
System.Diagnostics.Debug (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (< portable-net45+win8+wp8+wpa81)
@@ -659,7 +653,7 @@ GITHUB
659653
src/Fable.Import.VSCode.fs (ce5c778ec42d2738c6d5c13d08f663a819e0e37b)
660654
src/Helpers.fs (ce5c778ec42d2738c6d5c13d08f663a819e0e37b)
661655
GROUP Build
662-
RESTRICTION: == net471
656+
RESTRICTION: == net472
663657
NUGET
664658
remote: https://www.nuget.org/api/v2
665659
FAKE (4.64.13)

‎src/paket.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ let potentialDirectories =
4040
let findBinary name =
4141
potentialDirectories
4242
|> List.map (fun dir -> dir </> name)
43-
|> List.tryFind (U2.Case1 >> Fs.existsSync)
43+
|> List.tryFind (U2.Case1 >> fs.existsSync)
4444

4545
let pluginPaket = pluginBinPath </> "paket.exe"
4646
let pluginBootstrapper = pluginBinPath </> "paket.bootstrapper.exe"

0 commit comments

Comments
 (0)